Fix transform of polyline and path

ntkwan · Nov 28, 2023 · f1a5cb6 · f1a5cb6
1 parent 01e8da1
commit f1a5cb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Parser.cpp b/src/Parser.cpp
@@ -175,9 +175,8 @@ void Parser::parseObjects(std::string file_name) {
                         if (attribute.first == "transform") {
                             for (auto &object_attribute : object.second) {
                                 if (object_attribute.first == "transform") {
-                                    object_attribute.second =
-                                        attribute.second + " " +
-                                        object_attribute.second;
+                                    object_attribute.second +=
+                                        " " + attribute.second;
                                 }
                             }
                         }
@@ -407,7 +406,6 @@ std::vector< std::string > Parser::getTransformOrder(Attributes attributes) {
 }
 
 void Parser::parseSVG() {
-    printObjects();
     for (auto object : objects) {
         std::string name = object.first;
         Attributes attributes = object.second;
@@ -509,6 +507,7 @@ void Parser::parsePolyline(Attributes attributes) {
     for (auto point : points) {
         shape->addPoint(point);
     }
+    shape->setTransforms(getTransformOrder(attributes));
     shapes.push_back(shape);
 }
 
@@ -535,6 +534,7 @@ void Parser::parsePath(Attributes attributes) {
     for (auto point : points) {
         shape->addPoint(point);
     }
+    shape->setTransforms(getTransformOrder(attributes));
     shapes.push_back(shape);
 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -15,7 +15,7 @@ int main() {
     Viewer *viewer = Viewer::getInstance(window, view);
     Parser *parser = Parser::getInstance("external/samples/mixed/sample8.svg");
     Renderer *renderer = Renderer::getInstance(window);
-    parser->printObjects();
+
     while (window.isOpen()) {
         sf::Event event;