renamed internal variable for better readibility.
Change-Id: I07dc66c4bd63f2aec8036aab14ec3ed608820fbc
//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;
}
m.e33 = 1.0f;
//scale
- m.e11 *= factor;
- m.e22 *= factor;
+ m.e11 *= scale;
+ m.e22 *= scale;
//rotation
if (fabsf(degree) > FLT_EPSILON) {
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();
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;
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;