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

code refactoring.

Browse source 
revise internal class & variable names for better code readibility.

Change-Id: I7f1b4474f3129c3be04444350496485f000afd15
This commit is contained in:
Hermet Park 2020-04-18 23:07:15 +09:00
parent 9b7337622d
commit 7097940c22
3 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lib/gl_engine/tvgGlRenderer.cpp
View file

@ -24,7 +24,7 @@
/* Internal Class Implementation */ /* Internal Class Implementation */
/************************************************************************/ /************************************************************************/
static RenderMethodInit engineInit; static RenderInitializer renderInit;
struct GlShape struct GlShape
{ {
@ -58,31 +58,31 @@ void* GlRenderer::prepare(const ShapeNode& shape, void* data, UpdateFlag flags)
int GlRenderer::init() int GlRenderer::init()
{ {
return RenderMethodInit::init(engineInit, new GlRenderer); return RenderInitializer::init(renderInit, new GlRenderer);
} }
int GlRenderer::term() int GlRenderer::term()
{ {
return RenderMethodInit::term(engineInit); return RenderInitializer::term(renderInit);
} }
size_t GlRenderer::unref() size_t GlRenderer::unref()
{ {
return RenderMethodInit::unref(engineInit); return RenderInitializer::unref(renderInit);
} }
size_t GlRenderer::ref() size_t GlRenderer::ref()
{ {
return RenderMethodInit::ref(engineInit); return RenderInitializer::ref(renderInit);
} }
GlRenderer* GlRenderer::inst() GlRenderer* GlRenderer::inst()
{ {
return dynamic_cast<GlRenderer*>(RenderMethodInit::inst(engineInit)); return dynamic_cast<GlRenderer*>(RenderInitializer::inst(renderInit));
} }

12
src/lib/sw_engine/tvgSwRenderer.cpp
View file

@ -24,7 +24,7 @@
/* Internal Class Implementation */ /* Internal Class Implementation */
/************************************************************************/ /************************************************************************/
static RenderMethodInit engineInit; static RenderInitializer renderInit;
/************************************************************************/ /************************************************************************/
@ -70,31 +70,31 @@ void* SwRenderer::prepare(const ShapeNode& shape, void* data, UpdateFlag flags)
int SwRenderer::init() int SwRenderer::init()
{ {
return RenderMethodInit::init(engineInit, new SwRenderer); return RenderInitializer::init(renderInit, new SwRenderer);
} }
int SwRenderer::term() int SwRenderer::term()
{ {
return RenderMethodInit::term(engineInit); return RenderInitializer::term(renderInit);
} }
size_t SwRenderer::unref() size_t SwRenderer::unref()
{ {
return RenderMethodInit::unref(engineInit); return RenderInitializer::unref(renderInit);
} }
size_t SwRenderer::ref() size_t SwRenderer::ref()
{ {
return RenderMethodInit::ref(engineInit); return RenderInitializer::ref(renderInit);
} }
SwRenderer* SwRenderer::inst() SwRenderer* SwRenderer::inst()
{ {
return dynamic_cast<SwRenderer*>(RenderMethodInit::inst(engineInit)); return dynamic_cast<SwRenderer*>(RenderInitializer::inst(renderInit));
} }

52
src/lib/tvgCommon.h
View file

@ -40,60 +40,60 @@ public:
virtual size_t unref() = 0; virtual size_t unref() = 0;
}; };
struct RenderMethodInit struct RenderInitializer
{ {
RenderMethod* pInst = nullptr; RenderMethod* pInst = nullptr;
size_t refCnt = 0; size_t refCnt = 0;
bool initted = false; bool initialized = false;
static int init(RenderMethodInit& initter, RenderMethod* engine) static int init(RenderInitializer& renderInit, RenderMethod* engine)
{ {
assert(engine); assert(engine);
if (initter.pInst || initter.refCnt > 0) return -1; if (renderInit.pInst || renderInit.refCnt > 0) return -1;
initter.pInst = engine; renderInit.pInst = engine;
initter.refCnt = 0; renderInit.refCnt = 0;
initter.initted = true; renderInit.initialized = true;
return 0; return 0;
} }
static int term(RenderMethodInit& initter) static int term(RenderInitializer& renderInit)
{ {
if (!initter.pInst || !initter.initted) return -1; if (!renderInit.pInst || !renderInit.initialized) return -1;
initter.initted = false; renderInit.initialized = false;
//Still it's refered.... //Still it's refered....
if (initter.refCnt > 0) return 0; if (renderInit.refCnt > 0) return 0;
delete(initter.pInst); delete(renderInit.pInst);
initter.pInst = nullptr; renderInit.pInst = nullptr;
return 0; return 0;
} }
static size_t unref(RenderMethodInit& initter) static size_t unref(RenderInitializer& renderInit)
{ {
assert(initter.refCnt > 0); assert(renderInit.refCnt > 0);
--initter.refCnt; --renderInit.refCnt;
//engine has been requested to termination //engine has been requested to termination
if (!initter.initted && initter.refCnt == 0) { if (!renderInit.initialized && renderInit.refCnt == 0) {
if (initter.pInst) { if (renderInit.pInst) {
delete(initter.pInst); delete(renderInit.pInst);
initter.pInst = nullptr; renderInit.pInst = nullptr;
} }
} }
return initter.refCnt; return renderInit.refCnt;
} }
static RenderMethod* inst(RenderMethodInit& initter) static RenderMethod* inst(RenderInitializer& renderInit)
{ {
assert(initter.pInst); assert(renderInit.pInst);
return initter.pInst; return renderInit.pInst;
} }
static size_t ref(RenderMethodInit& initter) static size_t ref(RenderInitializer& renderInit)
{ {
return ++initter.refCnt; return ++renderInit.refCnt;
} }
}; };