comon: code refactoring

renamed internal variable for better readibility.

Change-Id: I07dc66c4bd63f2aec8036aab14ec3ed608820fbc

diff --git a/src/lib/tvgRender.cpp b/src/lib/tvgRender.cpp
index 4317aac..89edcb1 100644 (file)
--- a/src/lib/tvgRender.cpp
+++ b/src/lib/tvgRender.cpp
@@ -48,7 +48,7 @@ bool RenderTransform::update()
 
     //Init Status
     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;
     }
 
@@ -64,8 +64,8 @@ bool RenderTransform::update()
     m.e33 = 1.0f;
 
     //scale
-    m.e11 *= factor;
-    m.e22 *= factor;
+    m.e11 *= scale;
+    m.e22 *= scale;
 
     //rotation
     if (fabsf(degree) > FLT_EPSILON) {

diff --git a/src/lib/tvgRender.h b/src/lib/tvgRender.h
index e20271b..576961e 100644 (file)
--- a/src/lib/tvgRender.h
+++ b/src/lib/tvgRender.h
@@ -36,7 +36,7 @@ struct RenderTransform
     float x = 0.0f;
     float y = 0.0f;
     float degree = 0.0f;  //rotation degree
-    float factor = 1.0f;  //scale factor
+    float scale = 1.0f;   //scale factor
     bool overriding = false;  //user transform?
 
     bool update();

diff --git a/src/lib/tvgSceneImpl.h b/src/lib/tvgSceneImpl.h
index a70991c..9972d72 100644 (file)
--- a/src/lib/tvgSceneImpl.h
+++ b/src/lib/tvgSceneImpl.h
@@ -166,13 +166,13 @@ struct Scene::Impl
     bool scale(float factor)
     {
         if (rTransform) {
-            if (fabsf(factor - rTransform->factor) <= FLT_EPSILON) return true;
+            if (fabsf(factor - rTransform->scale) <= FLT_EPSILON) return true;
         } else {
             if (fabsf(factor) <= FLT_EPSILON) return true;
             rTransform = new RenderTransform();
             if (!rTransform) return false;
         }
-        rTransform->factor = factor;
+        rTransform->scale = factor;
         flag |= RenderUpdateFlag::Transform;
 
         return true;

diff --git a/src/lib/tvgShapeImpl.h b/src/lib/tvgShapeImpl.h
index fa670f0..54d37a3 100644 (file)
--- a/src/lib/tvgShapeImpl.h
+++ b/src/lib/tvgShapeImpl.h
@@ -105,13 +105,13 @@ struct Shape::Impl
     bool scale(float factor)
     {
         if (rTransform) {
-            if (fabsf(factor - rTransform->factor) <= FLT_EPSILON) return true;
+            if (fabsf(factor - rTransform->scale) <= FLT_EPSILON) return true;
         } else {
             if (fabsf(factor) <= FLT_EPSILON) return true;
             rTransform = new RenderTransform();
             if (!rTransform) return false;
         }
-        rTransform->factor = factor;
+        rTransform->scale = factor;
         if (!rTransform->overriding) flag |= RenderUpdateFlag::Transform;
 
         return true;