From ca6417ec8d848b67d75a3242c4a00501284ef6a3 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 16 Jul 2020 17:17:16 +0900 Subject: [PATCH] svg_loader: code refactoring. leave to shape to handle non-effective values. Change-Id: I4193653710498e0ea31b0ff88fd8f0f8f0238e0e --- src/loaders/svg_loader/tvgSvgSceneBuilder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/loaders/svg_loader/tvgSvgSceneBuilder.cpp b/src/loaders/svg_loader/tvgSvgSceneBuilder.cpp index 64d34b9..c651368 100644 --- a/src/loaders/svg_loader/tvgSvgSceneBuilder.cpp +++ b/src/loaders/svg_loader/tvgSvgSceneBuilder.cpp @@ -229,9 +229,9 @@ void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, floa if (node->transform) { float tx = 0, ty = 0, s = 0, z = 0; _getTransformationData(node->transform, &tx, &ty, &s, &z); - if (!(fabsf(s - 1) <= FLT_EPSILON)) vg->scale(s); - if (!(fmod(fabsf(z), 360.0) <= FLT_EPSILON)) vg->rotate(fmod(z, 360.0)); - if (!(fabsf(tx) <= FLT_EPSILON) && !(fabsf(ty) <= FLT_EPSILON)) vg->translate(tx, ty); + vg->scale(s); + vg->rotate(z); + vg->translate(tx, ty); } if (node->type == SvgNodeType::Doc) return; @@ -362,9 +362,9 @@ unique_ptr _sceneBuildHelper(SvgNode* node, float vx, float vy, float vw, if (node->transform) { float tx = 0, ty = 0, s = 0, z = 0; _getTransformationData(node->transform, &tx, &ty, &s, &z); - if (!(fabsf(s - 1) <= FLT_EPSILON)) scene->scale(s); - if (!(fmod(fabsf(z), 360.0) <= FLT_EPSILON)) scene->rotate(fmod(z, 360.0)); - if (!(fabsf(tx) <= FLT_EPSILON) && !(fabsf(ty) <= FLT_EPSILON)) scene->translate(tx, ty); + scene->scale(s); + scene->rotate(z); + scene->translate(tx, ty); } node->style->opacity = (node->style->opacity * parentOpacity) / 255.0f; for (auto child : node->child) { -- 2.7.4