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

comon: code refactoring

Browse source 
renamed internal variable for better readibility.

Change-Id: I07dc66c4bd63f2aec8036aab14ec3ed608820fbc
This commit is contained in:
Hermet Park 2020-07-22 18:45:11 +09:00
parent 96477c0a24
commit 5dcafb8b89
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/tvgRender.cpp
View file

@ -48,7 +48,7 @@ bool RenderTransform::update()
//Init Status //Init Status
if (fabsf(x) <= FLT_EPSILON && fabsf(y) <= FLT_EPSILON && if (fabsf(x) <= FLT_EPSILON && fabsf(y) <= FLT_EPSILON &&
fabsf(degree) <= FLT_EPSILON && fabsf(factor - 1) <= FLT_EPSILON) { fabsf(degree) <= FLT_EPSILON && fabsf(scale - 1) <= FLT_EPSILON) {
return false; return false;
} }
@ -64,8 +64,8 @@ bool RenderTransform::update()
m.e33 = 1.0f; m.e33 = 1.0f;
//scale //scale
m.e11 *= factor; m.e11 *= scale;
m.e22 *= factor; m.e22 *= scale;
//rotation //rotation
if (fabsf(degree) > FLT_EPSILON) { if (fabsf(degree) > FLT_EPSILON) {

2
src/lib/tvgRender.h
View file

@ -36,7 +36,7 @@ struct RenderTransform
float x = 0.0f; float x = 0.0f;
float y = 0.0f; float y = 0.0f;
float degree = 0.0f; //rotation degree float degree = 0.0f; //rotation degree
float factor = 1.0f; //scale factor float scale = 1.0f; //scale factor
bool overriding = false; //user transform? bool overriding = false; //user transform?
bool update(); bool update();

4
src/lib/tvgSceneImpl.h
View file

@ -166,13 +166,13 @@ struct Scene::Impl
bool scale(float factor) bool scale(float factor)
{ {
if (rTransform) { if (rTransform) {
if (fabsf(factor - rTransform->factor) <= FLT_EPSILON) return true; if (fabsf(factor - rTransform->scale) <= FLT_EPSILON) return true;
} else { } else {
if (fabsf(factor) <= FLT_EPSILON) return true; if (fabsf(factor) <= FLT_EPSILON) return true;
rTransform = new RenderTransform(); rTransform = new RenderTransform();
if (!rTransform) return false; if (!rTransform) return false;
} }
rTransform->factor = factor; rTransform->scale = factor;
flag |= RenderUpdateFlag::Transform; flag |= RenderUpdateFlag::Transform;
return true; return true;

4
src/lib/tvgShapeImpl.h
View file

@ -105,13 +105,13 @@ struct Shape::Impl
bool scale(float factor) bool scale(float factor)
{ {
if (rTransform) { if (rTransform) {
if (fabsf(factor - rTransform->factor) <= FLT_EPSILON) return true; if (fabsf(factor - rTransform->scale) <= FLT_EPSILON) return true;
} else { } else {
if (fabsf(factor) <= FLT_EPSILON) return true; if (fabsf(factor) <= FLT_EPSILON) return true;
rTransform = new RenderTransform(); rTransform = new RenderTransform();
if (!rTransform) return false; if (!rTransform) return false;
} }
rTransform->factor = factor; rTransform->scale = factor;
if (!rTransform->overriding) flag |= RenderUpdateFlag::Transform; if (!rTransform->overriding) flag |= RenderUpdateFlag::Transform;
return true; return true;