X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fmodules%2Fmod_svg%2Fsvg_parser.cpp;h=6a5d12cfaf9d576a071d1bff56a7d3dddd377ba1;hb=9e2225fa6926e20e833ce1c495332b38a4938cb8;hp=5e762fcc2fc0038ce0227ca97d1c4451bc637921;hpb=77cb15961e810fba3b038a260e0e80037213dd1d;p=synfig.git diff --git a/synfig-core/src/modules/mod_svg/svg_parser.cpp b/synfig-core/src/modules/mod_svg/svg_parser.cpp index 5e762fc..6a5d12c 100644 --- a/synfig-core/src/modules/mod_svg/svg_parser.cpp +++ b/synfig-core/src/modules/mod_svg/svg_parser.cpp @@ -210,235 +210,202 @@ Svg_parser::parser_canvas (const xmlpp::Node* node){ //parser preferences //Seperate transformations: apply transformations on a per-layer basis, rather than on canvases //Resolve BLine transformations: resolve transformations instead of creating transformation layers -//All Paths: convert objects to paths -// 1: when necessary -// 2: when necessary, including for linking -// 3: always #define SVG_SEP_TRANSFORMS 1 #define SVG_RESOLVE_BLINE 1 -#define SVG_CONVERT_PATHS 1 void Svg_parser::parser_graphics(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){ if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ Glib::ustring nodename = node->get_name(); - if(nodename.compare("g")==0 || nodename.compare("rect")==0 || nodename.compare("polygon")==0 || nodename.compare("path")==0){ - //load sub-attributes - Glib::ustring id =nodeElement->get_attribute_value("id"); - Glib::ustring transform =nodeElement->get_attribute_value("transform"); - - //resolve transformations - Matrix* mtx=NULL; - if(!transform.empty()) - mtx=build_transform (transform); - if (SVG_SEP_TRANSFORMS) - { - if(mtx_parent){ - if(mtx) - composeMatrix(&mtx,mtx_parent,mtx); - else - mtx=newMatrix(mtx_parent); - } - } - if(nodename.compare("g")==0){ - parser_layer (node,root->add_child("layer"),parent_style,mtx); - return; + if (nodename.compare("g")==0 || nodename.compare("path")==0 || nodename.compare("polygon")==0 || nodename.compare("rect")==0){} else return; + + //load sub-attributes + Glib::ustring id =nodeElement->get_attribute_value("id"); + Glib::ustring transform =nodeElement->get_attribute_value("transform"); + + //resolve transformations + Matrix* mtx=NULL; + if(!transform.empty()) + mtx=build_transform (transform); + if (SVG_SEP_TRANSFORMS) + { + if(mtx_parent){ + if(mtx) + composeMatrix(&mtx,mtx_parent,mtx); + else + mtx=newMatrix(mtx_parent); } + } + if(nodename.compare("g")==0){ + parser_layer (node,root->add_child("layer"),parent_style,mtx); + return; + } - Glib::ustring obj_style =nodeElement->get_attribute_value("style"); - Glib::ustring obj_fill =nodeElement->get_attribute_value("fill"); + Glib::ustring obj_style =nodeElement->get_attribute_value("style"); + Glib::ustring obj_fill =nodeElement->get_attribute_value("fill"); - //style - String fill =loadAttribute("fill",obj_style,parent_style,"none"); - String fill_rule =loadAttribute("fill-rule",obj_style,parent_style,"evenodd"); - String stroke =loadAttribute("stroke",obj_style,parent_style,"none"); - String stroke_width =loadAttribute("stroke-width",obj_style,parent_style,"1px"); - String stroke_linecap =loadAttribute("stroke-linecap",obj_style,parent_style,"butt"); - String stroke_linejoin =loadAttribute("stroke-linejoin",obj_style,parent_style,"miter"); - String stroke_opacity =loadAttribute("stroke-opacity",obj_style,parent_style,"1"); - String fill_opacity =loadAttribute("fill-opacity",obj_style,parent_style,"1"); - String opacity =loadAttribute("opacity",obj_style,parent_style,"1"); + //style + String fill =loadAttribute("fill",obj_style,parent_style,obj_fill,"none"); + String fill_rule =loadAttribute("fill-rule",obj_style,parent_style,"evenodd"); + String stroke =loadAttribute("stroke",obj_style,parent_style,"none"); + String stroke_width =loadAttribute("stroke-width",obj_style,parent_style,"1px"); + String stroke_linecap =loadAttribute("stroke-linecap",obj_style,parent_style,"butt"); + String stroke_linejoin =loadAttribute("stroke-linejoin",obj_style,parent_style,"miter"); + String stroke_opacity =loadAttribute("stroke-opacity",obj_style,parent_style,"1"); + String fill_opacity =loadAttribute("fill-opacity",obj_style,parent_style,"1"); + String opacity =loadAttribute("opacity",obj_style,parent_style,"1"); - //Fill - int typeFill=0; //nothing + //Fill + int typeFill=0; //nothing - if(fill.compare("none")!=0){ - typeFill=1; //simple - } - if(typeFill==1 && fill.compare(0,3,"url")==0){ - typeFill=2; //gradient - } - //Stroke - int typeStroke=0;//nothing + if(fill.compare("none")!=0){ + typeFill=1; //simple + } + if(typeFill==1 && fill.compare(0,3,"url")==0){ + typeFill=2; //gradient + } + //Stroke + int typeStroke=0;//nothing - if(stroke.compare("none")!=0){ - typeStroke=1; //simple - } - if(typeStroke==1 && stroke.compare(0,3,"url")==0){ - typeStroke=2; //gradient - } - - xmlpp::Element* child_fill = root; //TODO: child_filter - xmlpp::Element* child_stroke = root; - if(typeFill!=0 && typeStroke!=0){ - child_fill=child_stroke=nodeStartBasicLayer(root->add_child("layer")); - } + if(stroke.compare("none")!=0){ + typeStroke=1; //simple + } + if(typeStroke==1 && stroke.compare(0,3,"url")==0){ + typeStroke=2; //gradient + } + + xmlpp::Element* child_layer = nodeStartBasicLayer(root->add_child("layer")); + xmlpp::Element* child_fill = child_layer; + xmlpp::Element* child_stroke = child_layer; + if(typeFill==2){ + child_fill=nodeStartBasicLayer(child_fill->add_child("layer")); + } + if(typeStroke==2){ + child_stroke=nodeStartBasicLayer(child_stroke->add_child("layer")); + } + + //make simple fills + if(nodename.compare("rect")==0 && typeFill!=0){ + rect_simple(nodeElement,child_fill,fill,fill_opacity,opacity); if(typeFill==2){ - child_fill=nodeStartBasicLayer(child_fill->add_child("layer")); - } - if(typeStroke==2){ - child_stroke=nodeStartBasicLayer(child_stroke->add_child("layer")); - } - if ((SVG_CONVERT_PATHS == 1 && typeFill!=0) || (SVG_CONVERT_PATHS == 2 && typeFill!=0 && typeStroke==0)) { - //make simple fills - if(nodename.compare("rect")==0){ - rect_simple(nodeElement,child_fill,fill,fill_opacity,opacity); - if(typeFill==2){ - build_url (child_fill->add_child("layer"),fill,mtx); - } - typeFill=0; //set fill to zero so as not to create a fill layer in the paths section - } + build_url (child_fill->add_child("layer"),fill,NULL); } + parser_effects(nodeElement,child_layer,parent_style,mtx); + return; + } - //======================================================================= - std::list > k; - if (nodename.compare("path")==0 || typeStroke!=0 || SVG_CONVERT_PATHS==3) { - //if we are creating a bline - - //First, create the list of vertices - - - /*if(nodename.compare("rect")==0){ - parser_rect(nodeElement,root,parent_style,mtx); - }else if(nodename.compare("polygon")==0){ - parser_polygon(nodeElement,root,parent_style,mtx); - }else if(nodename.compare("path")==0){ - parser_path (nodeElement,root,parent_style,mtx); - } */ - - if(nodename.compare("path")==0){ - k=parser_path_d (nodeElement->get_attribute_value("d"),mtx); - } else {return;} - int n = k.size(); - String bline_id[n]; - String offset_id[n]; - for (int i=0;i > k; + //if we are creating a bline - std::list >::iterator aux = k.begin(); - if(typeFill!=0){//region layer - for (int i=0; aux!=k.end(); aux++){ - xmlpp::Element *child_region=child_fill->add_child("layer"); - child_region->set_attribute("type","region"); - child_region->set_attribute("active","true"); - child_region->set_attribute("version","0.1"); - child_region->set_attribute("desc",id); - build_param (child_region->add_child("param"),"z_depth","real","0.0000000000"); - build_param (child_region->add_child("param"),"amount","real","1.0000000000"); - build_param (child_region->add_child("param"),"blend_method","integer","0"); - build_color (child_region->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),atof(fill_opacity.data())*atof(opacity.data())); - build_vector (child_region->add_child("param"),"offset",0,0,offset_id[i]); - build_param (child_region->add_child("param"),"invert","bool","false"); - build_param (child_region->add_child("param"),"antialias","bool","true"); - build_param (child_region->add_child("param"),"feather","real","0.0000000000"); - build_param (child_region->add_child("param"),"blurtype","integer","1"); - if(fill_rule.compare("evenodd")==0) build_param (child_region->add_child("param"),"winding_style","integer","1"); - else build_param (child_region->add_child("param"),"winding_style","integer","0"); - - build_bline (child_region->add_child("param"),*aux,loop,bline_id[i]); - - if(k.size()==1 && typeFill==2){ //gradient in onto mode (fill) - build_url(child_fill->add_child("layer"),fill,mtx); - } - i++; - } - } + //First, create the list of vertices + if (SVG_RESOLVE_BLINE) { + if(nodename.compare("path")==0){ + k=parser_path_d (nodeElement->get_attribute_value("d"),mtx); + } else if(nodename.compare("polygon")==0){ + k=parser_polygon_path (nodeElement->get_attribute_value("points"),mtx); + } + } else { + if(nodename.compare("path")==0){ + k=parser_path_d (nodeElement->get_attribute_value("d"),NULL); + } else if(nodename.compare("polygon")==0){ + k=parser_polygon_path (nodeElement->get_attribute_value("points"),NULL); + } + } + + int n = k.size(); + String bline_id[n]; + String offset_id[n]; + for (int i=0;iadd_child("layer"); - child_outline->set_attribute("type","outline"); - child_outline->set_attribute("active","true"); - child_outline->set_attribute("version","0.2"); - child_outline->set_attribute("desc",id); - build_param (child_outline->add_child("param"),"z_depth","real","0.0000000000"); - build_param (child_outline->add_child("param"),"amount","real","1.0000000000"); - build_param (child_outline->add_child("param"),"blend_method","integer","0"); - build_color (child_outline->add_child("param"),getRed(stroke),getGreen(stroke),getBlue(stroke),atof(stroke_opacity.data())*atof(opacity.data())); - build_vector (child_outline->add_child("param"),"offset",0,0,offset_id[i]); - build_param (child_outline->add_child("param"),"invert","bool","false"); - build_param (child_outline->add_child("param"),"antialias","bool","true"); - build_param (child_outline->add_child("param"),"feather","real","0.0000000000"); - build_param (child_outline->add_child("param"),"blurtype","integer","1"); - //outline in nonzero - build_param (child_outline->add_child("param"),"winding_style","integer","0"); - - build_bline (child_outline->add_child("param"),*aux,loop,bline_id[i]); - - stroke_width=etl::strprintf("%f",getDimension(stroke_width)/kux); - build_param (child_outline->add_child("param"),"width","real",stroke_width); - build_param (child_outline->add_child("param"),"expand","real","0.0000000000"); - if(stroke_linejoin.compare("miter")==0) build_param (child_outline->add_child("param"),"sharp_cusps","bool","true"); - else build_param (child_outline->add_child("param"),"sharp_cusps","bool","false"); - if(stroke_linecap.compare("butt")==0){ - build_param (child_outline->add_child("param"),"round_tip[0]","bool","false"); - build_param (child_outline->add_child("param"),"round_tip[1]","bool","false"); - }else{ - build_param (child_outline->add_child("param"),"round_tip[0]","bool","true"); - build_param (child_outline->add_child("param"),"round_tip[1]","bool","true"); - } - build_param (child_outline->add_child("param"),"loopyness","real","1.0000000000"); - build_param (child_outline->add_child("param"),"homogeneous_width","bool","true"); + std::list >::iterator aux = k.begin(); + if(typeFill!=0){//region layer + for (int i=0; aux!=k.end(); aux++){ + xmlpp::Element *child_region=child_fill->add_child("layer"); + child_region->set_attribute("type","region"); + child_region->set_attribute("active","true"); + child_region->set_attribute("version","0.1"); + child_region->set_attribute("desc",id); + build_param (child_region->add_child("param"),"z_depth","real","0.0000000000"); + build_param (child_region->add_child("param"),"amount","real","1.0000000000"); + build_param (child_region->add_child("param"),"blend_method","integer","0"); + build_color (child_region->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),atof(fill_opacity.data())*atof(opacity.data())); + build_vector (child_region->add_child("param"),"offset",0,0,offset_id[i]); + build_param (child_region->add_child("param"),"invert","bool","false"); + build_param (child_region->add_child("param"),"antialias","bool","true"); + build_param (child_region->add_child("param"),"feather","real","0.0000000000"); + build_param (child_region->add_child("param"),"blurtype","integer","1"); + if(fill_rule.compare("evenodd")==0) build_param (child_region->add_child("param"),"winding_style","integer","1"); + else build_param (child_region->add_child("param"),"winding_style","integer","0"); + + build_bline (child_region->add_child("param"),*aux,loop,bline_id[i]); + i++; + } + } + if(typeFill==2){ //gradient in onto mode (fill) + if (SVG_RESOLVE_BLINE) + build_url(child_fill->add_child("layer"),fill,mtx); + else + build_url(child_fill->add_child("layer"),fill,NULL); + } - if(n==1 && typeStroke==2){ //gradient in onto mode (stroke) - build_url(child_stroke->add_child("layer"),stroke,mtx); - } - i++; - } + if(typeStroke!=0){//outline layer + int i=0; + for (aux=k.begin(); aux!=k.end(); aux++){ + xmlpp::Element *child_outline=child_stroke->add_child("layer"); + child_outline->set_attribute("type","outline"); + child_outline->set_attribute("active","true"); + child_outline->set_attribute("version","0.2"); + child_outline->set_attribute("desc",id); + build_param (child_outline->add_child("param"),"z_depth","real","0.0000000000"); + build_param (child_outline->add_child("param"),"amount","real","1.0000000000"); + build_param (child_outline->add_child("param"),"blend_method","integer","0"); + build_color (child_outline->add_child("param"),getRed(stroke),getGreen(stroke),getBlue(stroke),atof(stroke_opacity.data())*atof(opacity.data())); + build_vector (child_outline->add_child("param"),"offset",0,0,offset_id[i]); + build_param (child_outline->add_child("param"),"invert","bool","false"); + build_param (child_outline->add_child("param"),"antialias","bool","true"); + build_param (child_outline->add_child("param"),"feather","real","0.0000000000"); + build_param (child_outline->add_child("param"),"blurtype","integer","1"); + //outline in nonzero + build_param (child_outline->add_child("param"),"winding_style","integer","0"); + + build_bline (child_outline->add_child("param"),*aux,loop,bline_id[i]); + + stroke_width=etl::strprintf("%f",getDimension(stroke_width)/kux); + build_param (child_outline->add_child("param"),"width","real",stroke_width); + build_param (child_outline->add_child("param"),"expand","real","0.0000000000"); + if(stroke_linejoin.compare("miter")==0) build_param (child_outline->add_child("param"),"sharp_cusps","bool","true"); + else build_param (child_outline->add_child("param"),"sharp_cusps","bool","false"); + if(stroke_linecap.compare("butt")==0){ + build_param (child_outline->add_child("param"),"round_tip[0]","bool","false"); + build_param (child_outline->add_child("param"),"round_tip[1]","bool","false"); + }else{ + build_param (child_outline->add_child("param"),"round_tip[0]","bool","true"); + build_param (child_outline->add_child("param"),"round_tip[1]","bool","true"); } + build_param (child_outline->add_child("param"),"loopyness","real","1.0000000000"); + build_param (child_outline->add_child("param"),"homogeneous_width","bool","true"); - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - - - - - - - - - - - - - - - - - - - - - - - - - - + i++; } - //if(nodename.compare("rect")==0){ - // parser_rect(nodeElement,root,parent_style,mtx); - //}else if(nodename.compare("polygon")==0){ - // parser_polygon(nodeElement,root,parent_style,mtx); - //} + if(typeStroke==2){ //gradient in onto mode (stroke) + if (SVG_RESOLVE_BLINE) + build_url(child_stroke->add_child("layer"),fill,mtx); + else + build_url(child_stroke->add_child("layer"),fill,NULL); + } + if (SVG_RESOLVE_BLINE) + parser_effects(nodeElement,child_layer,parent_style,NULL); + else + parser_effects(nodeElement,child_layer,parent_style,mtx); + } } } @@ -474,59 +441,6 @@ Svg_parser::rect_simple(const xmlpp::Element* nodeElement,xmlpp::Element* root,S } - -void -Svg_parser::parser_rect(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){ - Glib::ustring rect_id =nodeElement->get_attribute_value("id"); - Glib::ustring rect_style =nodeElement->get_attribute_value("style"); - Glib::ustring rect_x =nodeElement->get_attribute_value("x"); - Glib::ustring rect_y =nodeElement->get_attribute_value("y"); - Glib::ustring rect_width =nodeElement->get_attribute_value("width"); - Glib::ustring rect_height =nodeElement->get_attribute_value("height"); - //style - String fill =loadAttribute("fill",rect_style,parent_style,"none"); - String fill_opacity =loadAttribute("fill-opacity",rect_style,parent_style,"1"); - String opacity =loadAttribute("opacity",rect_style,parent_style,"1"); - //matrix - //it's some complicated - - //build - - int typeFill=0; - if(fill.compare(0,3,"url")==0){ - typeFill=2; - root=nodeStartBasicLayer(root->add_child("layer")); - } - xmlpp::Element *child_layer; - if(typeFill==2){ - child_layer=root->add_child("layer"); - }else{ - child_layer=root; - } - xmlpp::Element *child_rect=child_layer->add_child("layer"); - child_rect->set_attribute("type","rectangle"); - child_rect->set_attribute("active","true"); - child_rect->set_attribute("version","0.2"); - child_rect->set_attribute("desc",rect_id); - - build_real(child_rect->add_child("param"),"z_depth",0.0); - build_real(child_rect->add_child("param"),"amount",1.0); - build_integer(child_rect->add_child("param"),"blend_method",0); - build_color (child_rect->add_child("param"),getRed (fill),getGreen (fill),getBlue(fill),atof(opacity.data())*atof(fill_opacity.data())); - - float auxx=atof(rect_x.c_str()); - float auxy=atof(rect_y.c_str()); - coor2vect(&auxx,&auxy); - build_vector (child_rect->add_child("param"),"point1",auxx,auxy); - auxx= atof(rect_x.c_str()) + atof(rect_width.c_str()); - auxy= atof(rect_y.c_str()) + atof(rect_height.c_str()); - coor2vect(&auxx,&auxy); - build_vector (child_rect->add_child("param"),"point2",auxx,auxy); - if(typeFill==2){ - build_url (child_layer->add_child("layer"),fill,mtx); - } - -} void Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx){ if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ @@ -568,24 +482,15 @@ Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String par parser_graphics (*iter,child_canvas,layer_style,mtx); } } + if (! SVG_SEP_TRANSFORMS) parser_effects(nodeElement,child_canvas,parent_style,mtx); } } -void -Svg_parser::parser_polygon(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){ - //load sub-attributes - Glib::ustring polygon_style =nodeElement->get_attribute_value("style"); - Glib::ustring polygon_id =nodeElement->get_attribute_value("id"); - Glib::ustring polygon_points =nodeElement->get_attribute_value("points"); - Glib::ustring polygon_fill =nodeElement->get_attribute_value("fill"); - String fill =loadAttribute("fill",polygon_style,parent_style,polygon_fill,"none"); - String fill_rule =loadAttribute("fill-rule",polygon_style,parent_style,"evenodd"); - String fill_opacity =loadAttribute("fill-opacity",polygon_style,parent_style,"1"); - String opacity =loadAttribute("opacity",polygon_style,parent_style,"1"); - - - //points + +std::list > +Svg_parser::parser_polygon_path(Glib::ustring polygon_points, Matrix* mtx){ + std::list > k0; if(polygon_points.empty()) - return; + return k0; std::list k; std::vector tokens=get_tokens_path (polygon_points); unsigned int i; @@ -601,171 +506,8 @@ Svg_parser::parser_polygon(const xmlpp::Element* nodeElement,xmlpp::Element* roo //save k.push_back(newVertice(ax,ay)); } - //escritura - xmlpp::Element *child_polygon; - - //gradient - int typeFill=0; - if(fill.compare(0,3,"url")==0){ - typeFill=2;//gradient - root=nodeStartBasicLayer(root->add_child("layer")); - } - child_polygon=root->add_child("layer"); - child_polygon->set_attribute("type","polygon"); - child_polygon->set_attribute("active","true"); - child_polygon->set_attribute("version","0.1"); - child_polygon->set_attribute("desc",polygon_id); - build_param (child_polygon->add_child("param"),"z_depth","real","0.0000000000"); - build_param (child_polygon->add_child("param"),"amount","real","1.0000000000"); - build_param (child_polygon->add_child("param"),"blend_method","integer","0"); - build_color (child_polygon->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),atof(fill_opacity.data())*atof(opacity.data())); - build_vector(child_polygon->add_child("param"),"offset",0,0); - build_param (child_polygon->add_child("param"),"invert","bool","false"); - build_param (child_polygon->add_child("param"),"antialias","bool","true"); - build_param (child_polygon->add_child("param"),"feather","real","0.0000000000"); - build_param (child_polygon->add_child("param"),"blurtype","integer","1"); - if(fill_rule.compare("evenodd")==0) build_param (child_polygon->add_child("param"),"winding_style","integer","1"); - else build_param (child_polygon->add_child("param"),"winding_style","integer","0"); - build_points (child_polygon->add_child("param"),k); - - if(typeFill==2){ - build_url(root->add_child("layer"),fill,mtx); - } - -} -void -Svg_parser::parser_path(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){ - //load sub-attributes - Glib::ustring path_style =nodeElement->get_attribute_value("style"); - Glib::ustring path_id =nodeElement->get_attribute_value("id"); - Glib::ustring path_d =nodeElement->get_attribute_value("d"); - Glib::ustring path_transform =nodeElement->get_attribute_value("transform"); - Glib::ustring path_fill =nodeElement->get_attribute_value("fill"); - - String fill =loadAttribute("fill",path_style,parent_style,path_fill,"none"); - String fill_rule =loadAttribute("fill-rule",path_style,parent_style,"evenodd"); - String stroke =loadAttribute("stroke",path_style,parent_style,"none"); - String stroke_width =loadAttribute("stroke-width",path_style,parent_style,"1px"); - String stroke_linecap =loadAttribute("stroke-linecap",path_style,parent_style,"butt"); - String stroke_linejoin =loadAttribute("stroke-linejoin",path_style,parent_style,"miter"); - String stroke_opacity =loadAttribute("stroke-opacity",path_style,parent_style,"1"); - String fill_opacity =loadAttribute("fill-opacity",path_style,parent_style,"1"); - String opacity =loadAttribute("opacity",path_style,parent_style,"1"); - - //parser path_d attribute, this is obviously important - std::list > k; - k=parser_path_d (path_d,mtx); - - //Fill - int typeFill=0; //nothing - - if(fill.compare("none")!=0){ - typeFill=1; //simple - } - if(typeFill==1 && fill.compare(0,3,"url")==0){ - typeFill=2; //gradient - } - //Stroke - int typeStroke=0;//nothing - - if(stroke.compare("none")!=0){ - typeStroke=1; //simple - } - if(typeStroke==1 && stroke.compare(0,3,"url")==0){ - typeStroke=2; //gradient - } - String bline_id; - String offset_id; - int n=k.size(); - if(n!=1){ //if n is > than 1 then we must create a paste canvas for all paths - root=nodeStartBasicLayer(root->add_child("layer")); - } - std::list >::iterator aux = k.begin(); - for (; aux!=k.end(); aux++){ - if(typeFill!=0 && typeStroke!=0){ - bline_id=new_guid(); - offset_id=new_guid(); - } - if(typeFill==1 || typeFill==2){//region layer - xmlpp::Element *child_fill=root; - if(n==1 && typeFill==2){//open gradient or url (fill) - child_fill=nodeStartBasicLayer(root->add_child("layer")); - } - xmlpp::Element *child_region=child_fill->add_child("layer"); - child_region->set_attribute("type","region"); - child_region->set_attribute("active","true"); - child_region->set_attribute("version","0.1"); - child_region->set_attribute("desc",path_id); - build_param (child_region->add_child("param"),"z_depth","real","0.0000000000"); - build_param (child_region->add_child("param"),"amount","real","1.0000000000"); - build_param (child_region->add_child("param"),"blend_method","integer","0"); - build_color (child_region->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),atof(fill_opacity.data())*atof(opacity.data())); - if(offset_id.empty()) build_vector (child_region->add_child("param"),"offset",0,0); - else build_vector (child_region->add_child("param"),"offset",0,0,offset_id); - build_param (child_region->add_child("param"),"invert","bool","false"); - build_param (child_region->add_child("param"),"antialias","bool","true"); - build_param (child_region->add_child("param"),"feather","real","0.0000000000"); - build_param (child_region->add_child("param"),"blurtype","integer","1"); - if(fill_rule.compare("evenodd")==0) build_param (child_region->add_child("param"),"winding_style","integer","1"); - else build_param (child_region->add_child("param"),"winding_style","integer","0"); - - build_bline (child_region->add_child("param"),*aux,loop,bline_id); - - if(n==1 && typeFill==2){ //gradient in onto mode (fill) - build_url(child_fill->add_child("layer"),fill,mtx); - } - } - - if(typeStroke==1 || typeStroke==2){ //layer outline - xmlpp::Element *child_stroke=root; - if(n==1 && typeStroke==2){//open gradient in straigth onto (stroke) - child_stroke=nodeStartBasicLayer(root->add_child("layer")); - } - xmlpp::Element *child_outline=child_stroke->add_child("layer"); - child_outline->set_attribute("type","outline"); - child_outline->set_attribute("active","true"); - child_outline->set_attribute("version","0.2"); - child_outline->set_attribute("desc",path_id); - build_param (child_outline->add_child("param"),"z_depth","real","0.0000000000"); - build_param (child_outline->add_child("param"),"amount","real","1.0000000000"); - build_param (child_outline->add_child("param"),"blend_method","integer","0"); - build_color (child_outline->add_child("param"),getRed(stroke),getGreen(stroke),getBlue(stroke),atof(stroke_opacity.data())*atof(opacity.data())); - if(offset_id.empty()) build_vector (child_outline->add_child("param"),"offset",0,0); - else build_vector (child_outline->add_child("param"),"offset",0,0,offset_id); - build_param (child_outline->add_child("param"),"invert","bool","false"); - build_param (child_outline->add_child("param"),"antialias","bool","true"); - build_param (child_outline->add_child("param"),"feather","real","0.0000000000"); - build_param (child_outline->add_child("param"),"blurtype","integer","1"); - //outline in nonzero - build_param (child_outline->add_child("param"),"winding_style","integer","0"); - - build_bline (child_outline->add_child("param"),*aux,loop,bline_id); - - stroke_width=etl::strprintf("%f",getDimension(stroke_width)/kux); - build_param (child_outline->add_child("param"),"width","real",stroke_width); - build_param (child_outline->add_child("param"),"expand","real","0.0000000000"); - if(stroke_linejoin.compare("miter")==0) build_param (child_outline->add_child("param"),"sharp_cusps","bool","true"); - else build_param (child_outline->add_child("param"),"sharp_cusps","bool","false"); - if(stroke_linecap.compare("butt")==0){ - build_param (child_outline->add_child("param"),"round_tip[0]","bool","false"); - build_param (child_outline->add_child("param"),"round_tip[1]","bool","false"); - }else{ - build_param (child_outline->add_child("param"),"round_tip[0]","bool","true"); - build_param (child_outline->add_child("param"),"round_tip[1]","bool","true"); - } - build_param (child_outline->add_child("param"),"loopyness","real","1.0000000000"); - build_param (child_outline->add_child("param"),"homogeneous_width","bool","true"); - - if(n==1 && typeStroke==2){ //gradient in onto mode (stroke) - build_url(child_stroke->add_child("layer"),stroke,mtx); - } - } - } - if(n!=1){//only fill for several canvas in one path - if(typeFill==2){ - build_url(root->add_child("layer"),fill,mtx); - } - } + k0.push_front(k); + return k0; } std::vector @@ -863,42 +605,71 @@ std::list > Svg_parser::parser_path_d(String path_d,Matrix* mtx){ std::list > k; std::list k1; + std::vector tokens=get_tokens_path(path_d); + String command="M"; //the current command float ax,ay,tgx,tgy,tgx2,tgy2;//each method - float actual_x=0,actual_y=0;//for relative methods; + ax=ay=0; + float actual_x=0,actual_y=0; //in svg coordinate space + float old_x=0,old_y=0; //needed in rare cases + float init_x=0,init_y=0; //for closepath commands loop=false; - unsigned int i; - std::vector tokens=get_tokens_path(path_d); - for(i=0;ix,k1.back()->y,tgx,tgy); setSplit(k1.back(),TRUE); } - }else if(tokens.at(i).compare("Q")==0){ //absolute quadractic curve + }else if(command.compare("Q")==0 || command.compare("q")==0){ //quadractic curve //tg1 and tg2 - i++; tgx=ax=atof(tokens.at(i).data()); + tgx=actual_x+atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - tgy=ay=atof(tokens.at(i).data()); + tgy=actual_y+atof(tokens.at(i).data()); //point - i++; ax=atof(tokens.at(i).data()); + i++; actual_x+=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); - actual_x=ax; - actual_y=ay; + actual_y+=atof(tokens.at(i).data()); + + ax=actual_x; + ay=actual_y; //mtx if(mtx){ transformPoint2D(mtx,&ax,&ay); @@ -942,72 +714,14 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ setSplit(k1.back(),FALSE); k1.push_back(newVertice (ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); - }else if(tokens.at(i).compare("L")==0){ //absolute line to + }else if(command.compare("L")==0 || command.compare("l")==0){ //line to //point - i++; ax=atof(tokens.at(i).data()); - i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); - actual_x=ax; - actual_y=ay; - //mtx - if(mtx) transformPoint2D(mtx,&ax,&ay); - //adjust - coor2vect(&ax,&ay); - //save - setTg2(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); - }else{ - k1.push_back(newVertice(ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - } - }else if(tokens.at(i).compare("l")==0){//relative line to - //point read - i++; ax=atof(tokens.at(i).data()); + actual_x+=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); - //relative - ax=actual_x+ax; - ay=actual_y+ay; - actual_x=ax; - actual_y=ay; - //mtx - if(mtx) transformPoint2D(mtx,&ax,&ay); - //adjust - coor2vect(&ax,&ay); - //save - setTg2(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); - }else{ - k1.push_back(newVertice(ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - } - }else if(tokens.at(i).compare("H")==0){//absolute horizontal move - //the same that L but only Horizontal movement - //point - i++; ax=atof(tokens.at(i).data()); - ay=actual_y; - actual_x=ax; - actual_y=ay; - //mtx - if(mtx) transformPoint2D(mtx,&ax,&ay); - //adjust - coor2vect(&ax,&ay); - //save - setTg2(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); - }else{ - k1.push_back(newVertice(ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - } - }else if(tokens.at(i).compare("h")==0){//horizontal relative - i++; ax=atof(tokens.at(i).data()); - ax=actual_x+ax; + actual_y+=atof(tokens.at(i).data()); + + ax=actual_x; ay=actual_y; - actual_x=ax; - actual_y=ay; //mtx if(mtx) transformPoint2D(mtx,&ax,&ay); //adjust @@ -1020,12 +734,13 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ k1.push_back(newVertice(ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); } - }else if(tokens.at(i).compare("V")==0){//vertical absolute + }else if(command.compare("H")==0 || command.compare("h")==0){// horizontal move + //the same that L but only Horizontal movement //point - i++; ay=atof(tokens.at(i).data()); + actual_x+=atof(tokens.at(i).data()); + ax=actual_x; - actual_x=ax; - actual_y=ay; + ay=old_y; //mtx if(mtx) transformPoint2D(mtx,&ax,&ay); //adjust @@ -1038,13 +753,12 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ k1.push_back(newVertice(ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); } - }else if(tokens.at(i).compare("v")==0){//relative + }else if(command.compare("V")==0 || command.compare("v")==0){//vertical //point - i++; ay=atof(tokens.at(i).data()); - ax=actual_x; - ay=actual_y+ay; - actual_x=ax; - actual_y=ay; + actual_y+=atof(tokens.at(i).data()); + + ax=old_x; + ay=actual_y; //mtx if(mtx) transformPoint2D(mtx,&ax,&ay); //adjust @@ -1057,8 +771,11 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ k1.push_back(newVertice(ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); } - }else if(tokens.at(i).compare("T")==0){// I don't know what does it - }else if(tokens.at(i).compare("A")==0){//elliptic arc + }else if(command.compare("T")==0 || command.compare("t")==0){// I don't know what does it + actual_x+=atof(tokens.at(i).data()); + i++; if(tokens.at(i).compare(",")==0) i++; + actual_y+=atof(tokens.at(i).data()); + }else if(command.compare("A")==0 || command.compare("a")==0){//elliptic arc //isn't complete support, is only for circles @@ -1068,7 +785,7 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ float angle; bool sweep,large; //radio - i++; radio_x=atof(tokens.at(i).data()); + radio_x=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; radio_y=atof(tokens.at(i).data()); //angle @@ -1077,18 +794,19 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ i++; large=atoi(tokens.at(i).data()); i++; sweep=atoi(tokens.at(i).data()); //point - i++; ax=atof(tokens.at(i).data()); + i++; actual_x+=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); + actual_y+=atof(tokens.at(i).data()); //how to draw? if(!large && !sweep){ //points - tgx2 = actual_x + radio_x*0.5; - tgy2 = actual_y ; - tgx = ax; - tgy = ay + radio_y*0.5; - actual_x=ax; - actual_y=ay; + tgx2 = old_x + radio_x*0.5; + tgy2 = old_y ; + tgx = actual_x; + tgy = actual_y + radio_y*0.5; + + ax=actual_x; + ay=actual_y; //transformations if(mtx){ transformPoint2D(mtx,&tgx2,&tgy2); @@ -1110,12 +828,13 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ } }else if(!large && sweep){ //points - tgx2 = actual_x; - tgy2 = actual_y + radio_y*0.5; - tgx = ax + radio_x*0.5; - tgy = ay ; - actual_x=ax; - actual_y=ay; + tgx2 = old_x; + tgy2 = old_y + radio_y*0.5; + tgx = actual_x + radio_x*0.5; + tgy = actual_y ; + + ax=actual_x; + ay=actual_y; //transformations if(mtx){ transformPoint2D(mtx,&tgx2,&tgy2); @@ -1138,65 +857,79 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ }else if( large && !sweep){//rare //this need more than one vertex }else if( large && sweep){//circles in inkscape are made with this kind of arc - if(actual_y==ay){//circles - //intermediate point - int sense=1; - if(actual_x>ax) sense =-1; - float in_x,in_y,in_tgx1,in_tgy1,in_tgx2,in_tgy2; - in_x = (actual_x+ax)/2; - in_y = actual_y - sense*radio_y; - in_tgx1 = in_x - sense*(radio_x*0.5); - in_tgx2 = in_x + sense*(radio_x*0.5); - in_tgy1 = in_y; - in_tgy2 = in_y; - //start/end points - tgx2=actual_x; - tgy2=ay - sense*(radio_y*0.5); - tgx =ax; - tgy =ay - sense*(radio_y*0.5); - - actual_x=ax; - actual_y=ay; - //transformations - if(mtx){ - transformPoint2D(mtx,&tgx2,&tgy2); - transformPoint2D(mtx,&tgx ,&tgy ); - transformPoint2D(mtx,&ax,&ay); - - transformPoint2D(mtx,&in_tgx2,&in_tgy2); - transformPoint2D(mtx,&in_tgx1,&in_tgy1); - transformPoint2D(mtx,&in_x,&in_y); - } - //adjust - coor2vect(&tgx2 , &tgy2); - coor2vect(&ax , &ay ); - coor2vect(&tgx , &tgy ); - - coor2vect(&in_tgx2 , &in_tgy2); - coor2vect(&in_tgx1 , &in_tgy1); - coor2vect(&in_x , &in_y ); - - //save the last tg2 - setTg2(k1.back(),k1.back()->x,k1.back()->y,tgx2,tgy2); - //save the intermediate point - k1.push_back(newVertice (in_x,in_y)); - setTg1(k1.back(),k1.back()->x,k1.back()->y, in_tgx1 , in_tgy1); - setTg2(k1.back(),k1.back()->x,k1.back()->y, in_tgx2 , in_tgy2); - setSplit(k1.back(),TRUE); //this could be changed - //save the new point - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy); - }else{ - k1.push_back(newVertice (ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); - setSplit(k1.back(),TRUE); - } + //intermediate point + int sense=1; + if(old_x>actual_x) sense =-1; + float in_x,in_y,in_tgx1,in_tgy1,in_tgx2,in_tgy2; + in_x = (old_x+actual_x)/2; + in_y = old_y - sense*radio_y; + in_tgx1 = in_x - sense*(radio_x*0.5); + in_tgx2 = in_x + sense*(radio_x*0.5); + in_tgy1 = in_y; + in_tgy2 = in_y; + //start/end points + tgx2=old_x; + tgy2=actual_y - sense*(radio_y*0.5); + tgx =actual_x; + tgy =actual_y - sense*(radio_y*0.5); + + ax=actual_x; + ay=actual_y; + //transformations + if(mtx){ + transformPoint2D(mtx,&tgx2,&tgy2); + transformPoint2D(mtx,&tgx ,&tgy ); + transformPoint2D(mtx,&ax,&ay); + + transformPoint2D(mtx,&in_tgx2,&in_tgy2); + transformPoint2D(mtx,&in_tgx1,&in_tgy1); + transformPoint2D(mtx,&in_x,&in_y); + } + //adjust + coor2vect(&tgx2 , &tgy2); + coor2vect(&ax , &ay ); + coor2vect(&tgx , &tgy ); + + coor2vect(&in_tgx2 , &in_tgy2); + coor2vect(&in_tgx1 , &in_tgy1); + coor2vect(&in_x , &in_y ); + + //save the last tg2 + setTg2(k1.back(),k1.back()->x,k1.back()->y,tgx2,tgy2); + //save the intermediate point + k1.push_back(newVertice (in_x,in_y)); + setTg1(k1.back(),k1.back()->x,k1.back()->y, in_tgx1 , in_tgy1); + setTg2(k1.back(),k1.back()->x,k1.back()->y, in_tgx2 , in_tgy2); + setSplit(k1.back(),TRUE); //this could be changed + //save the new point + if(isFirst(k1.front(),ax,ay)){ + setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy); + }else{ + k1.push_back(newVertice (ax,ay)); + setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); + setSplit(k1.back(),TRUE); } } - }else if(tokens.at(i).compare("z")==0){ + }else if(command.compare("z")==0){ loop=true; + if(!k1.empty()) + k.push_front(k1); + k1.clear(); + if (iadd_child("layer"); + child_transform->set_attribute("type","warp"); + child_transform->set_attribute("active","true"); + child_transform->set_attribute("version","0.1"); + child_transform->set_attribute("desc","Transform"); + + float x,y; + x=100;y=100;coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"src_tl",x,y); + + x=200;y=200;coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"src_br",x,y); + + + x=100;y=100; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_tl",x,y); + + x=200;y=100; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_tr",x,y); + + x=200;y=200; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_br",x,y); + + x=100;y=200; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_bl",x,y); + + build_param (child_transform->add_child("param"),"clip","bool","false"); + build_param (child_transform->add_child("param"),"horizon","real","4.0"); + } +} + + +void Svg_parser::parser_defs(const xmlpp::Node* node){ const xmlpp::ContentNode* nodeContent = dynamic_cast(node); if(!nodeContent){ @@ -1219,6 +991,7 @@ Svg_parser::parser_defs(const xmlpp::Node* node){ } } } + void Svg_parser::AdjustPointUrl(){ /*