** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2008 Chris Moore
** Copyright (c) 2009 Carlos A. Sosa Navarro
+** Copyright (c) 2009 Nikita Kitaev
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
/* === G L O B A L S ======================================================= */
+//PARSER PREFERENCES
+
+//Seperate transformations: apply transformations on a per-layer basis, rather than on canvases
+#define SVG_SEP_TRANSFORMS 1
+
+//Resolve BLine transformations: resolve transformations instead of creating transformation layers
+#define SVG_RESOLVE_BLINE 1
+
/* === P R O C E D U R E S ================================================= */
Canvas::Handle
*/
//UPDATE
+
+/* === PARSERS ============================================================= */
+
void
Svg_parser::parser_node(const xmlpp::Node* node){
const xmlpp::ContentNode* nodeContent = dynamic_cast<const xmlpp::ContentNode*>(node);
else nodeRoot->add_child("name")->set_child_text("Synfig Animation 1");
}
set_canvas=1;
- AdjustPointUrl ();
}
-//Toplevel parser
-
-//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
-#define SVG_SEP_TRANSFORMS 1
-#define SVG_RESOLVE_BLINE 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<const xmlpp::Element*>(node)){
Glib::ustring nodename = node->get_name();
+ 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");
//resolve transformations
Matrix* mtx=NULL;
if(!transform.empty())
- mtx=build_transform (transform);
+ mtx=parser_transform (transform);
if (SVG_SEP_TRANSFORMS)
{
if(mtx_parent){
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"));
- }
+ xmlpp::Element* child_layer = root;
+ xmlpp::Element* child_fill;
+ xmlpp::Element* child_stroke;
//make simple fills
if(nodename.compare("rect")==0 && typeFill!=0){
- rect_simple(nodeElement,child_fill,fill,fill_opacity,opacity);
+ if (mtx) child_layer = nodeStartBasicLayer(root->add_child("layer"), id);
+ child_fill=child_layer;
+ parser_rect(nodeElement,child_fill,fill,fill_opacity,opacity);
if(typeFill==2){
- build_url (child_fill->add_child("layer"),fill,NULL);
+ build_fill (child_fill,fill,NULL);
}
parser_effects(nodeElement,child_layer,parent_style,mtx);
return;
}
-
+ if ((!(SVG_RESOLVE_BLINE) && mtx) || typeFill==2 || typeStroke==2)
+ child_layer = nodeStartBasicLayer(root->add_child("layer"), id);
+ child_fill=child_layer;
+ child_stroke=child_layer;
//=======================================================================
- std::list<std::list<Vertice*> > k;
+
+ std::list<BLine*> k;
//if we are creating a bline
- //First, create the list of vertices
+ //First, create the list of Verteces
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);
+ k=parser_path_polygon (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);
+ k=parser_path_polygon (nodeElement->get_attribute_value("points"),NULL);
}
}
- int n = k.size();
- String bline_id[n];
- String offset_id[n];
- for (int i=0;i<n;i++){
- bline_id[i]=new_guid();
- offset_id[i]=new_guid();
- }
+ std::list<BLine *>::iterator aux;
+ //int n = k.size();
- std::list<std::list<Vertice*> >::iterator aux = k.begin();
if(typeFill!=0){//region layer
- for (int i=0; aux!=k.end(); aux++){
+ /*if(typeFill==2){
+ child_fill=nodeStartBasicLayer(child_fill->add_child("layer"));
+ }*/
+ for (aux = k.begin(); 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");
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_vector (child_region->add_child("param"),"offset",0,0, *(*aux)->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");
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++;
+ build_bline (child_region->add_child("param"),*(*aux)->points,(*aux)->loop,*(*aux)->bline_id);
}
}
if(typeFill==2){ //gradient in onto mode (fill)
if (SVG_RESOLVE_BLINE)
- build_url(child_fill->add_child("layer"),fill,mtx);
+ build_fill(child_fill,fill,mtx);
else
- build_url(child_fill->add_child("layer"),fill,NULL);
+ build_fill(child_fill,fill,NULL);
}
if(typeStroke!=0){//outline layer
- int i=0;
+ if(typeStroke==2){
+ child_stroke=nodeStartBasicLayer(child_stroke->add_child("layer"),"stroke");
+ }
for (aux=k.begin(); aux!=k.end(); aux++){
xmlpp::Element *child_outline=child_stroke->add_child("layer");
child_outline->set_attribute("type","outline");
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_vector (child_outline->add_child("param"),"offset",0,0,*(*aux)->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");
//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]);
+ build_bline (child_outline->add_child("param"),*(*aux)->points,(*aux)->loop,*(*aux)->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"),"loopyness","real","1.0000000000");
build_param (child_outline->add_child("param"),"homogeneous_width","bool","true");
-
-
- i++;
}
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);
-
+ if (SVG_RESOLVE_BLINE)
+ build_fill(child_stroke,stroke,mtx);
+ else
+ build_fill(child_stroke,stroke,NULL);
+ }
}
+
+ if (SVG_RESOLVE_BLINE)
+ parser_effects(nodeElement,child_layer,parent_style,NULL);
+ else
+ parser_effects(nodeElement,child_layer,parent_style,mtx);
}
}
-void
-Svg_parser::rect_simple(const xmlpp::Element* nodeElement,xmlpp::Element* root,String fill, String fill_opacity, String opacity){
- Glib::ustring rect_id =nodeElement->get_attribute_value("id");
- 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");
-
- xmlpp::Element *child_rect=root->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);
-
-
-}
+/* === LAYER PARSERS ======================================================= */
void
Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx){
parser_graphics (*iter,child_canvas,layer_style,mtx);
}
}
- parser_effects(nodeElement,child_canvas,parent_style,mtx);
+ if (SVG_SEP_TRANSFORMS) parser_effects(nodeElement,child_canvas,parent_style,NULL);
+ else parser_effects(nodeElement,child_canvas,parent_style,mtx);
}
}
-std::list<std::list<Vertice*> >
-Svg_parser::parser_polygon_path(Glib::ustring polygon_points, Matrix* mtx){
- std::list<std::list<Vertice*> > k0;
+void
+Svg_parser::parser_rect(const xmlpp::Element* nodeElement,xmlpp::Element* root,String fill, String fill_opacity, String opacity){
+ Glib::ustring rect_id =nodeElement->get_attribute_value("id");
+ 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");
+
+ xmlpp::Element *child_rect=root->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);
+
+
+}
+
+/* === CONVERT TO PATH PARSERS ============================================= */
+
+std::list<BLine *>
+Svg_parser::parser_path_polygon(Glib::ustring polygon_points, Matrix* mtx){
+ std::list<BLine *> k0;
if(polygon_points.empty())
return k0;
- std::list<Vertice*> k;
+ std::list<Vertex*> points;
std::vector<String> tokens=get_tokens_path (polygon_points);
unsigned int i;
float ax,ay; ax=ay=0;
//adjust
coor2vect(&ax,&ay);
//save
- k.push_back(newVertice(ax,ay));
+ points.push_back(newVertex(ax,ay));
}
- k0.push_front(k);
+ k0.push_front(newBLine(&points, true));
return k0;
}
-std::vector<String>
-Svg_parser::get_tokens_path(String path){ //mini path lexico-parser
- std::vector<String> tokens;
- String buffer;
- int e=0;
- unsigned int i=0;
- char a;
- while(i<path.size()){
- a=path.at(i);
- switch(e){
- case 0: //initial state
- if(a=='m'){ e=1; i++;}
- else if(a=='c'){ e= 2; i++;}
- else if(a=='q'){ e= 3; i++;}
- else if(a=='t'){ e= 4; i++;}
- else if(a=='a'){ e= 5; i++;}
- else if(a=='l'){ e= 6; i++;}
- else if(a=='v'){ e= 7; i++;}
- else if(a=='h'){ e= 8; i++;}
- else if(a=='M'){ e= 9; i++;}
- else if(a=='C'){ e=10; i++;}
- else if(a=='Q'){ e=11; i++;}
- else if(a=='T'){ e=12; i++;}
- else if(a=='A'){ e=13; i++;}
- else if(a=='L'){ e=14; i++;}
- else if(a=='V'){ e=15; i++;}
- else if(a=='H'){ e=16; i++;}
- else if(a=='z' || a=='Z'){ e=17; i++;}
- else if(a=='-' ||a=='.'|| isdigit (a)){ e=18;}
- else if(a==','){ e=19; i++;}
- else if(a==' '){i++;}
- break;
- //relative
- case 1 : tokens.push_back("m"); e=0; break;//move
- case 2 : tokens.push_back("c"); e=0; break;//curve
- case 3 : tokens.push_back("q"); e=0; break;//quadratic
- case 4 : tokens.push_back("t"); e=0; break;//smooth quadratic
- case 5 : tokens.push_back("a"); e=0; break;//elliptic arc
- case 6 : tokens.push_back("l"); e=0; break;//line to
- case 7 : tokens.push_back("v"); e=0; break;//vertical
- case 8 : tokens.push_back("h"); e=0; break;//horizontal
- //absolute
- case 9 : tokens.push_back("M"); e=0; break;
- case 10: tokens.push_back("C"); e=0; break;
- case 11: tokens.push_back("Q"); e=0; break;
- case 12: tokens.push_back("T"); e=0; break;
- case 13: tokens.push_back("A"); e=0; break;
- case 14: tokens.push_back("L"); e=0; break;
- case 15: tokens.push_back("V"); e=0; break;
- case 16: tokens.push_back("H"); e=0; break;
+std::list<BLine *>
+Svg_parser::parser_path_d(String path_d,Matrix* mtx){
+ std::list<BLine *> k;
+ std::list<Vertex*> k1;
- case 17: tokens.push_back("z"); e=0; break;//loop
- case 18: if(a=='-'||a=='.'|| isdigit (a)){
- buffer.append(path.substr(i,1));i++;
- }else{
- e=20;
- }
- break;
- case 19: tokens.push_back(","); e=0; break;
- case 20: tokens.push_back(buffer);
- buffer.clear();
- e=0; break;
- default: break;
+ std::vector<String> tokens=get_tokens_path(path_d);
+ String command="M"; //the current command
+ float ax,ay,tgx,tgy,tgx2,tgy2;//each method
+ 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
+
+ for(unsigned int i=0;i<tokens.size();i++){
+ //if the token is a command, change the current command
+ if(tokens.at(i).compare("M")==0 || tokens.at(i).compare("m")==0 || tokens.at(i).compare("L")==0 || tokens.at(i).compare("l")==0 || tokens.at(i).compare("H")==0 || tokens.at(i).compare("h")==0 || tokens.at(i).compare("V")==0 || tokens.at(i).compare("v")==0 || tokens.at(i).compare("C")==0 || tokens.at(i).compare("c")==0 || tokens.at(i).compare("S")==0 || tokens.at(i).compare("s")==0 || tokens.at(i).compare("Q")==0 || tokens.at(i).compare("q")==0 || tokens.at(i).compare("T")==0 || tokens.at(i).compare("t")==0 || tokens.at(i).compare("A")==0 || tokens.at(i).compare("a")==0 || tokens.at(i).compare("z")==0) {
+ command=tokens.at(i);
+ i++;
+ }
+
+ old_x=actual_x;
+ old_y=actual_y;
+ //if command is absolute, set actual_x/y to zero
+ if(command.compare("M")==0 || command.compare("L")==0 || command.compare("C")==0 || command.compare("S")==0 || command.compare("Q")==0 || command.compare("T")==0 || command.compare("A")==0 || command.compare("H")==0 || command.compare("V")==0) {
+ actual_x=0;
+ actual_y=0;
}
- }
- switch(e){//last element
- case 1 : tokens.push_back("m"); break;
- case 2 : tokens.push_back("c"); break;
- case 3 : tokens.push_back("q"); break;
- case 4 : tokens.push_back("t"); break;
- case 5 : tokens.push_back("a"); break;
- case 6 : tokens.push_back("l"); break;
- case 7 : tokens.push_back("v"); break;
- case 8 : tokens.push_back("h"); break;
- case 9 : tokens.push_back("M"); break;
- case 10: tokens.push_back("C"); break;
- case 11: tokens.push_back("Q"); break;
- case 12: tokens.push_back("T"); break;
- case 13: tokens.push_back("A"); break;
- case 14: tokens.push_back("L"); break;
- case 15: tokens.push_back("V"); break;
- case 16: tokens.push_back("H"); break;
- case 17: tokens.push_back("z"); break;
- case 18: tokens.push_back(buffer); break;
- case 19: tokens.push_back(","); break;
- case 20: tokens.push_back(buffer); break;
- default: break;
- }
- return tokens;
-}
-std::list<std::list<Vertice*> >
-Svg_parser::parser_path_d(String path_d,Matrix* mtx){
- std::list<std::list<Vertice*> > k;
- std::list<Vertice*> k1;
- float ax,ay,tgx,tgy,tgx2,tgy2;//each method
- float actual_x=0,actual_y=0;//for relative methods;
- loop=false;
- unsigned int i;
- std::vector<String> tokens=get_tokens_path(path_d);
- for(i=0;i<tokens.size();i++){
- if(tokens.at(i).compare("M")==0){//absolute move to
- if(!k1.empty())
- k.push_front(k1);
- k1.clear();
+ //now parse the commands
+ if(command.compare("M")==0 || command.compare("m")==0){ //move to
+ if(!k1.empty()) {
+ k.push_front(newBLine(&k1, false));
+ k1.clear();
+ }
//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());
- actual_x=ax;
- actual_y=ay;
+ actual_y+=atof(tokens.at(i).data());
+
+ init_x=actual_x;
+ init_y=actual_y;
+ ax=actual_x;
+ ay=actual_y;
//operate and save
if(mtx) transformPoint2D(mtx,&ax,&ay);
coor2vect(&ax,&ay);
- k1.push_back(newVertice (ax,ay)); //first element
+ k1.push_back(newVertex (ax,ay)); //first element
setSplit(k1.back(),TRUE);
- }else if(tokens.at(i).compare("C")==0){ //absolute curve
+ //"If a moveto is followed by multiple pairs of coordinates,
+ // the subsequent pairs are treated as implicit lineto commands."
+ if (command.compare("M")==0)
+ command="L";
+ else
+ command="l";
+ }else if(command.compare("C")==0 || command.compare("c")==0){ //curve
//tg2
- i++; tgx2=atof(tokens.at(i).data());
+ tgx2=actual_x+atof(tokens.at(i).data());
i++; if(tokens.at(i).compare(",")==0) i++;
- tgy2=atof(tokens.at(i).data());
+ tgy2=actual_y+atof(tokens.at(i).data());
//tg1
- i++; tgx=atof(tokens.at(i).data());
+ i++; tgx=actual_x+atof(tokens.at(i).data());
i++; if(tokens.at(i).compare(",")==0) i++;
- tgy=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,&tgx2,&tgy2);
if(isFirst(k1.front(),ax,ay)){
setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy);
}else{
- k1.push_back(newVertice (ax,ay));
+ k1.push_back(newVertex (ax,ay));
setTg1(k1.back(),k1.back()->x,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);
//save
setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy);
setSplit(k1.back(),FALSE);
- k1.push_back(newVertice (ax,ay));
+ k1.push_back(newVertex (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
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));
+ k1.push_back(newVertex(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
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));
+ k1.push_back(newVertex(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
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));
+ k1.push_back(newVertex(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
//this curve have 6 parameters
- //radio
- float radio_x,radio_y;
+ //radius
+ float radius_x,radius_y;
float angle;
bool sweep,large;
- //radio
- i++; radio_x=atof(tokens.at(i).data());
+ //radius
+ radius_x=atof(tokens.at(i).data());
i++; if(tokens.at(i).compare(",")==0) i++;
- radio_y=atof(tokens.at(i).data());
+ radius_y=atof(tokens.at(i).data());
//angle
i++; angle=atof(tokens.at(i).data());
//flags
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 + radius_x*0.5;
+ tgy2 = old_y ;
+ tgx = actual_x;
+ tgy = actual_y + radius_y*0.5;
+
+ ax=actual_x;
+ ay=actual_y;
//transformations
if(mtx){
transformPoint2D(mtx,&tgx2,&tgy2);
if(isFirst(k1.front(),ax,ay)){
setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy);
}else{
- k1.push_back(newVertice (ax,ay));
+ k1.push_back(newVertex (ax,ay));
setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy);
setSplit(k1.back(),TRUE);
}
}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 + radius_y*0.5;
+ tgx = actual_x + radius_x*0.5;
+ tgy = actual_y ;
+
+ ax=actual_x;
+ ay=actual_y;
//transformations
if(mtx){
transformPoint2D(mtx,&tgx2,&tgy2);
if(isFirst(k1.front(),ax,ay)){
setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy);
}else{
- k1.push_back(newVertice (ax,ay));
+ k1.push_back(newVertex (ax,ay));
setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy);
setSplit(k1.back(),TRUE);
}
}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);
- }
- }
- }
- }else if(tokens.at(i).compare("z")==0){
- loop=true;
- }else{
- std::cout<<"don't supported: "<<tokens.at(i)<<std::endl;
- }
+ //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*radius_y;
+ in_tgx1 = in_x - sense*(radius_x*0.5);
+ in_tgx2 = in_x + sense*(radius_x*0.5);
+ in_tgy1 = in_y;
+ in_tgy2 = in_y;
+ //start/end points
+ tgx2=old_x;
+ tgy2=actual_y - sense*(radius_y*0.5);
+ tgx =actual_x;
+ tgy =actual_y - sense*(radius_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(newVertex (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(newVertex (ax,ay));
+ setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy);
+ setSplit(k1.back(),TRUE);
+ }
+ }
+ }else if(command.compare("z")==0){
+ k.push_front(newBLine(&k1, true));
+ k1.clear();
+ if (i<tokens.size() && tokens.at(i).compare("M")!=0 && tokens.at(i).compare("m")!=0) {
+ //starting a new path, but not with a moveto
+ actual_x=init_x;
+ actual_y=init_y;
+ ax=actual_x;
+ ay=actual_y;
+ //operate and save
+ if(mtx) transformPoint2D(mtx,&ax,&ay);
+ coor2vect(&ax,&ay);
+ k1.push_back(newVertex (ax,ay)); //first element
+ setSplit(k1.back(),TRUE);
+ }
+ i--; //decrement i to balance "i++" at command change
+ }else{
+ std::cout<<"unsupported path token: "<<tokens.at(i)<<std::endl;
+ }
+ }
+ if(!k1.empty()) {
+ k.push_front(newBLine(&k1, false)); //last element
}
- if(!k1.empty())
- k.push_front(k1); //last element
return k;
}
+/* === EFFECTS PARSERS ===================================================== */
+
void
-Svg_parser::parser_effects(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){
-
+Svg_parser::parser_effects(const xmlpp::Element* /*nodeElement*/,xmlpp::Element* root,String /*parent_style*/,Matrix* mtx){
+ build_transform(root, mtx);
}
+/* === DEFS PARSERS ======================================================== */
void
Svg_parser::parser_defs(const xmlpp::Node* node){
}
}
+/* === BUILDS ============================================================== */
+
void
-Svg_parser::AdjustPointUrl(){
-/*
- if(!lg.empty()){//linealgradient
- std::list<LinearGradient*>::iterator aux=lg.begin();
- while(aux!=lg.end()){
- LinearGradient* auxlg=*aux;
- coor2vect (&auxlg->x1,&auxlg->y1);
- coor2vect (&auxlg->x2,&auxlg->y2);
- aux++;
- }
- }
- if(!rg.empty()){//radialgradient
- std::list<RadialGradient*>::iterator aux=rg.begin();
- while(aux!=rg.end()){
- RadialGradient* auxrg=*aux;
- coor2vect (&auxrg->cx,&auxrg->cy);
- auxrg->r= auxrg->r/kux;
- aux++;
- }
+Svg_parser::build_transform(xmlpp::Element* root,Matrix* mtx){
+ if (mtx) {
+ xmlpp::Element *child_transform=root->add_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");
}
-*/
}
+
std::list<ColorStop*>*
Svg_parser::find_colorStop(String name){
if(!name.empty()){
}
return NULL;
}
+
void
-Svg_parser::build_url(xmlpp::Element* root, String name,Matrix *mtx){
+Svg_parser::build_fill(xmlpp::Element* root, String name,Matrix *mtx){
if(!name.empty()){
- if(lg.empty()&& rg.empty())
- root->get_parent()->remove_child(root);
-
int start=name.find_first_of("#")+1;
int end=name.find_first_of(")");
String find= name.substr(start,end-start);
aux++;
}
}
- if(!encounter)
- root->get_parent()->remove_child(root);
- }else{
- root->get_parent()->remove_child(root);
}
}
void
void
Svg_parser::build_linearGradient(xmlpp::Element* root,LinearGradient* data,Matrix* mtx){
if(data){
- root->set_attribute("type","linear_gradient");
- root->set_attribute("active","true");
- root->set_attribute("desc","Gradient004");
- build_param (root->add_child("param"),"z_depth","real","0");
- build_param (root->add_child("param"),"amount","real","1");
+ xmlpp::Element* gradient=root->add_child("layer");
+
+ gradient->set_attribute("type","linear_gradient");
+ gradient->set_attribute("active","true");
+ gradient->set_attribute("desc",data->name);
+ build_param (gradient->add_child("param"),"z_depth","real","0");
+ build_param (gradient->add_child("param"),"amount","real","1");
//straight onto
- build_param (root->add_child("param"),"blend_method","integer","21");
+ build_param (gradient->add_child("param"),"blend_method","integer","21");
float x1,y1,x2,y2;
x1=data->x1;
y1=data->y1;
x2=data->x2;
y2=data->y2;
- if(mtx){
- transformPoint2D(mtx,&x1,&y1);
- transformPoint2D(mtx,&x2,&y2);
+
+
+ if (mtx || data->transform){
+ Matrix *mtx2=NULL;
+ if (mtx && data->transform){
+ composeMatrix(&mtx2,mtx,data->transform);
+ }else if (mtx){
+ mtx2=mtx;
+ }else if (data->transform){
+ mtx2=data->transform;
+ }
+ //matrix transforms the gradient as a whole
+ //it does not preserve angles, so we cant' simply transform both points
+ float x3, y3, k;
+ //set point (x3,y3) on the same gradient line as (x2,y2)
+ //the gradient line is perpendicular to (x1,y1)(x2,y2)
+ x3=x2+(y2-y1);
+ y3=y2-(x2-x1);
+ //transform everything
+ transformPoint2D(mtx2,&x1,&y1);
+ transformPoint2D(mtx2,&x2,&y2);
+ transformPoint2D(mtx2,&x3,&y3);
+
+ if (x2!=x3 && y2!=y3) {//divide by zero check
+
+ //set k as slope between (x2,y2) and (x3,y3)
+ //k is the slope of gradient lines post-transformation
+ k=(y3-y2)/(x3-x2);
+ //set point (x2,y2) on the gradient line passing through (x3,y3)
+ //so that the line (x1,y1)(x2,y2) is perpendicular to (x2,y2)(x3,y3)
+ x2= (x3*k+x1/k+y1-y3)/(k+(1/k));
+ y2= k*(x2-x3)+y3;
+ } else if (x2==x3 && y2!=y3) {
+ y2=y1;
+ } else if (x2!=x3 && y2==y3) {
+ x2=x1;
+ } else {
+ std::cout<<"SVG Import warning: gradient points equal each other"<<std::endl;
+ }
}
+
coor2vect (&x1,&y1);
coor2vect (&x2,&y2);
- build_vector (root->add_child("param"),"p1",x1,y1);
- build_vector (root->add_child("param"),"p2",x2,y2);
+ build_vector (gradient->add_child("param"),"p1",x1,y1);
+ build_vector (gradient->add_child("param"),"p2",x2,y2);
//gradient link
- xmlpp::Element *child=root->add_child("param");
- child->set_attribute("name","gradient");
- build_stop_color (child->add_child("gradient"),data->stops);
- build_param (root->add_child("param"),"loop","bool","false");
- build_param (root->add_child("param"),"zigzag","bool","false");
+ xmlpp::Element *child_stops=gradient->add_child("param");
+ child_stops->set_attribute("name","gradient");
+ child_stops->set_attribute("guid",GUID::hasher(data->name).get_string());
+ build_stop_color (child_stops->add_child("gradient"),data->stops);
+ build_param (gradient->add_child("param"),"loop","bool","false");
+ build_param (gradient->add_child("param"),"zigzag","bool","false");
}
}
void
Svg_parser::build_radialGradient(xmlpp::Element* root,RadialGradient* data,Matrix* mtx){
-//not completed
if(data){
- root->set_attribute("type","radial_gradient");
- root->set_attribute("active","true");
- build_param (root->add_child("param"),"z_depth","real","0");
- build_param (root->add_child("param"),"amount","real","1");
- //straight onto
- build_param (root->add_child("param"),"blend_method","integer","21");
+ xmlpp::Element* gradient;
+
+ if (mtx || data->transform) {
+ xmlpp::Element* layer=root->add_child("layer");
+
+ layer->set_attribute("type","PasteCanvas");
+ layer->set_attribute("active","true");
+ layer->set_attribute("version","0.1");
+ layer->set_attribute("desc",data->name);
+ build_param (layer->add_child("param"),"z_depth","real","0");
+ build_param (layer->add_child("param"),"amount","real","1");
+ build_param (layer->add_child("param"),"blend_method","integer","21"); //straight onto
+ build_vector (layer->add_child("param"),"origin",0,0);
+ xmlpp::Element *child=layer->add_child("param");
+ child->set_attribute("name","canvas");
+ xmlpp::Element* child_layer=child->add_child("canvas");
+
+ gradient=child_layer->add_child("layer");
+ gradient->set_attribute("desc",data->name);
+ build_param (gradient->add_child("param"),"blend_method","integer","0"); //composite
+ Matrix *mtx2=NULL;
+ if (mtx && data->transform){
+ composeMatrix(&mtx2,mtx,data->transform);
+ }else if (mtx){
+ mtx2=mtx;
+ }else if (data->transform){
+ mtx2=data->transform;
+ }
+ build_transform(child_layer,mtx2);
+
+ }else {
+ gradient=root->add_child("layer");
+ gradient->set_attribute("desc",data->name);
+ build_param (gradient->add_child("param"),"blend_method","integer","21"); //straight onto
+ }
+
+ gradient->set_attribute("type","radial_gradient");
+ gradient->set_attribute("active","true");
+ build_param (gradient->add_child("param"),"z_depth","real","0");
+ build_param (gradient->add_child("param"),"amount","real","1");
//gradient link
- xmlpp::Element *child=root->add_child("param");
- child->set_attribute("name","gradient");
- build_stop_color (child->add_child("gradient"),data->stops);
- //here the center point and radio
+ xmlpp::Element *child_stops=gradient->add_child("param");
+ child_stops->set_attribute("name","gradient");
+ child_stops->set_attribute("guid",GUID::hasher(data->name).get_string());
+ build_stop_color (child_stops->add_child("gradient"),data->stops);
+
+ //here the center point and radius
float cx=data->cx;
float cy=data->cy;
float r =data->r;
- //transform
- if(mtx){
- transformPoint2D(mtx,&cx,&cy);
- }
+
//adjust
coor2vect (&cx,&cy);
r=r/kux;
- build_vector (root->add_child("param"),"center",cx,cy);
- build_param (root->add_child("param"),"radius","real",r);
+ build_vector (gradient->add_child("param"),"center",cx,cy);
+ build_param (gradient->add_child("param"),"radius","real",r);
- build_param (root->add_child("param"),"loop","bool","false");
- build_param (root->add_child("param"),"zigzag","bool","false");
+ build_param (gradient->add_child("param"),"loop","bool","false");
+ build_param (gradient->add_child("param"),"zigzag","bool","false");
}
}
float x2 =atof(nodeElement->get_attribute_value("x2").data());
float y2 =atof(nodeElement->get_attribute_value("y2").data());
Glib::ustring link =nodeElement->get_attribute_value("href");
+ Glib::ustring transform =nodeElement->get_attribute_value("gradientTransform");
+
+ //resolve transformations
+ Matrix* mtx=NULL;
+ if(!transform.empty())
+ mtx=parser_transform (transform);
std::list<ColorStop*> *stops;
if(!link.empty()){
}
}
if(stops)
- lg.push_back(newLinearGradient(id,x1,y1,x2,y2,stops));
+ lg.push_back(newLinearGradient(id,x1,y1,x2,y2,stops,mtx));
}
}
Glib::ustring id =nodeElement->get_attribute_value("id");
float cx =atof(nodeElement->get_attribute_value("cx").data());
float cy =atof(nodeElement->get_attribute_value("cy").data());
+ float fx =atof(nodeElement->get_attribute_value("fx").data());
+ float fy =atof(nodeElement->get_attribute_value("fy").data());
float r =atof(nodeElement->get_attribute_value("r").data());
Glib::ustring link =nodeElement->get_attribute_value("href");//basic
+ Glib::ustring transform =nodeElement->get_attribute_value("gradientTransform");
+
+ if (cx!=fx || cy!=fy)
+ std::cout<<"SVG Parser: ignoring focus attributes for radial gradient";
+
+ //resolve transformations
+ Matrix* mtx=NULL;
+ if(!transform.empty())
+ mtx=parser_transform (transform);
+
std::list<ColorStop*> *stops=NULL;
if(!link.empty()){
//inkscape always use link, i dont need parser stops here, but it's posible
stops=find_colorStop (link);
}
if(stops)
- rg.push_back(newRadialGradient(id,cx,cy,r,stops));
+ rg.push_back(newRadialGradient(id,cx,cy,r,stops,mtx));
}
}
}
LinearGradient*
-Svg_parser::newLinearGradient(String name,float x1,float y1, float x2,float y2,std::list<ColorStop*> *stops){
+Svg_parser::newLinearGradient(String name,float x1,float y1, float x2,float y2,std::list<ColorStop*> *stops, Matrix* transform){
LinearGradient* data;
data=(LinearGradient*)malloc(sizeof(LinearGradient));
sprintf(data->name,"%s",name.data());
data->x2=x2;
data->y2=y2;
data->stops=stops;
+ data->transform=transform;
return data;
}
RadialGradient*
-Svg_parser::newRadialGradient(String name,float cx,float cy,float r,std::list<ColorStop*> *stops){
+Svg_parser::newRadialGradient(String name,float cx,float cy,float r,std::list<ColorStop*> *stops, Matrix* transform){
RadialGradient* data;
data=(RadialGradient*)malloc(sizeof(RadialGradient));
sprintf(data->name,"%s",name.data());
data->cy=cy;
data->r=r;
data->stops=stops;
+ data->transform=transform;
+ return data;
+}
+
+BLine*
+Svg_parser::newBLine(std::list<Vertex*> *points,bool loop){
+ BLine* data;
+ data=(BLine*)malloc(sizeof(BLine));
+ //sprintf(data->name,"%s",name.data());
+ data->points=new std::list<Vertex*> (*points);
+ data->loop=loop;
+ data->bline_id=new String(new_guid());
+ data->offset_id=new String(new_guid());
return data;
}
-//builds
void
Svg_parser::build_gamma(xmlpp::Element* root,float gamma){
root->set_attribute("type","colorcorrect");
root->set_attribute("desc","Gamma");
build_real (root->add_child("param"),"gamma",gamma);
}
-Matrix*
-Svg_parser::build_transform(const String transform){
- Matrix* a=NULL;
- String tf(transform);
- removeIntoS(&tf);
- std::vector<String> tokens=tokenize(tf," ");
- std::vector<String>::iterator aux=tokens.begin();
- while(aux!=tokens.end()){
- if((*aux).compare(0,9,"translate")==0){
- float dx,dy;
- int start,end;
- start =(*aux).find_first_of("(")+1;
- end =(*aux).find_first_of(",");
- dx =atof((*aux).substr(start,end-start).data());
- start =(*aux).find_first_of(",")+1;
- end =(*aux).size()-1;
- dy =atof((*aux).substr(start,end-start).data());
- if(matrixIsNull(a))
- a=newMatrix(1,0,0,1,dx,dy);
- else
- multiplyMatrix(&a,newMatrix(1,0,0,1,dx,dy));
- }else if((*aux).compare(0,5,"scale")==0){
- if(matrixIsNull(a))
- a=newMatrix(1,0,0,1,0,0);
- }else if((*aux).compare(0,6,"rotate")==0){
- float angle,seno,coseno;
- int start,end;
- start =(*aux).find_first_of("(")+1;
- end =(*aux).size()-1;
- angle=getRadian (atof((*aux).substr(start,end-start).data()));
- seno =sin(angle);
- coseno =cos(angle);
- if(matrixIsNull(a))
- a=newMatrix(coseno,seno,-1*seno,coseno,0,0);
- else
- multiplyMatrix(&a,newMatrix(coseno,seno,-1*seno,coseno,0,0));
- }else if((*aux).compare(0,6,"matrix")==0){
- int start =(*aux).find_first_of('(')+1;
- int end =(*aux).find_first_of(')');
- if(matrixIsNull(a))
- a=newMatrix((*aux).substr(start,end-start));
- else
- multiplyMatrix(&a,newMatrix((*aux).substr(start,end-start)));
- }else{
- a=newMatrix(1,0,0,1,0,0);
- }
- aux++;
- }
- return a;
-}
void
Svg_parser::build_translate(xmlpp::Element* root,float dx,float dy){
build_real (root->add_child("param"),"amount",angle);
}
void
-Svg_parser::build_points(xmlpp::Element* root,std::list<Vertice*> p){
+Svg_parser::build_points(xmlpp::Element* root,std::list<Vertex*> p){
root->set_attribute("name","vector_list");
xmlpp::Element *child=root->add_child("dynamic_list");
child->set_attribute("type","vector");
- std::list<Vertice*>::iterator aux = p.begin();
+ std::list<Vertex*>::iterator aux = p.begin();
while(aux!=p.end()){
xmlpp::Element *child_entry=child->add_child("entry");
xmlpp::Element *child_vector=child_entry->add_child("vector");
}
}
void
-Svg_parser::build_vertice(xmlpp::Element* root , Vertice *p){
+Svg_parser::build_vertex(xmlpp::Element* root , Vertex *p){
xmlpp::Element *child_comp=root->add_child("composite");
child_comp->set_attribute("type","bline_point");
build_vector (child_comp->add_child("param"),"point",p->x,p->y);
xmlpp::Element *child_t1=child_comp->add_child("t1");
xmlpp::Element *child_rc=child_t1->add_child("radial_composite");
child_rc->set_attribute("type","vector");
- build_param (child_rc->add_child("radius"),"","real",p->radio1);
+ build_param (child_rc->add_child("radius"),"","real",p->radius1);
build_param (child_rc->add_child("theta"),"","angle",p->angle1);
//tangent 2
xmlpp::Element *child_t2=child_comp->add_child("t2");
xmlpp::Element *child_rc2=child_t2->add_child("radial_composite");
child_rc2->set_attribute("type","vector");
- build_param (child_rc2->add_child("radius"),"","real",p->radio2);
+ build_param (child_rc2->add_child("radius"),"","real",p->radius2);
build_param (child_rc2->add_child("theta"),"","angle",p->angle2);
}
void
-Svg_parser::build_bline(xmlpp::Element* root,std::list<Vertice*> p,bool loop,String blineguid){
+Svg_parser::build_bline(xmlpp::Element* root,std::list<Vertex*> p,bool loop,String blineguid){
root->set_attribute("name","bline");
xmlpp::Element *child=root->add_child("bline");
child->set_attribute("type","bline_point");
else
child->set_attribute("loop","false");
if(!blineguid.empty()) child->set_attribute("guid",blineguid);
- std::list<Vertice*>::iterator aux = p.begin();
+ std::list<Vertex*>::iterator aux = p.begin();
while(aux!=p.end()){
- if(*aux) build_vertice (child->add_child("entry"),*aux);
+ if(*aux) build_vertex (child->add_child("entry"),*aux);
aux++;
}
}
}
xmlpp::Element*
-Svg_parser::nodeStartBasicLayer(xmlpp::Element* root){
+Svg_parser::nodeStartBasicLayer(xmlpp::Element* root, String name){
root->set_attribute("type","PasteCanvas");
root->set_attribute("active","true");
root->set_attribute("version","0.1");
- root->set_attribute("desc","Composite");
+ root->set_attribute("desc",name);
build_param (root->add_child("param"),"z_depth","real","0");
build_param (root->add_child("param"),"amount","real","1");
build_param (root->add_child("param"),"blend_method","integer","0");
return child->add_child("canvas");
}
-//extra methods
+/* === COORDINATES & TRANSFORMATIONS ======================================= */
void
Svg_parser::coor2vect(float *x,float *y){
float sx, sy;
}
void
-Svg_parser::setTg1(Vertice *p,float p1x,float p1y,float p2x,float p2y){
+Svg_parser::setTg1(Vertex *p,float p1x,float p1y,float p2x,float p2y){
float rd=0,ag=0;
float d1x,d1y,d2x,d2y,dx,dy;
d1x=p1x*60;
ag=PI;
}
ag= (ag*180)/PI;
- p->radio1=rd;
+ p->radius1=rd;
p->angle1=ag;
}
void
-Svg_parser::setTg2(Vertice* p,float p1x,float p1y,float p2x,float p2y){
+Svg_parser::setTg2(Vertex* p,float p1x,float p1y,float p2x,float p2y){
float rd=0,ag=0;
float d1x,d1y,d2x,d2y,dx,dy;
d1x=p1x*60;
}
ag= (ag*180)/PI;
ag=ag-180;
- p->radio2=rd;
+ p->radius2=rd;
p->angle2=ag;
}
void
-Svg_parser::setSplit(Vertice* p,bool val){
+Svg_parser::setSplit(Vertex* p,bool val){
if(p!=NULL){
p->split=val;
}
}
int
-Svg_parser::isFirst(Vertice* nodo,float a, float b){
+Svg_parser::isFirst(Vertex* nodo,float a, float b){
if(nodo->x==a && nodo->y==b)
return 1;
return 0;
}
-Vertice*
-Svg_parser::newVertice(float x,float y){
- Vertice* vert;
- vert=(Vertice*)malloc(sizeof(Vertice));
+Vertex*
+Svg_parser::newVertex(float x,float y){
+ Vertex* vert;
+ vert=(Vertex*)malloc(sizeof(Vertex));
vert->x=x;
vert->y=y;
- vert->radio1=vert->radio2=vert->angle1=vert->angle2=0;
+ vert->radius1=vert->radius2=vert->angle1=vert->angle2=0;
return vert;
}
+//matrices
+Matrix*
+Svg_parser::parser_transform(const String transform){
+ Matrix* a=NULL;
+ String tf(transform);
+ removeIntoS(&tf);
+ std::vector<String> tokens=tokenize(tf," ");
+ std::vector<String>::iterator aux=tokens.begin();
+ while(aux!=tokens.end()){
+ if((*aux).compare(0,9,"translate")==0){
+ float dx,dy;
+ int start,end;
+ start =(*aux).find_first_of("(")+1;
+ end =(*aux).find_first_of(",");
+ dx =atof((*aux).substr(start,end-start).data());
+ start =(*aux).find_first_of(",")+1;
+ end =(*aux).size()-1;
+ dy =atof((*aux).substr(start,end-start).data());
+ if(matrixIsNull(a))
+ a=newMatrix(1,0,0,1,dx,dy);
+ else
+ multiplyMatrix(&a,newMatrix(1,0,0,1,dx,dy));
+ }else if((*aux).compare(0,5,"scale")==0){
+ if(matrixIsNull(a))
+ a=newMatrix(1,0,0,1,0,0);
+ }else if((*aux).compare(0,6,"rotate")==0){
+ float angle,seno,coseno;
+ int start,end;
+ start =(*aux).find_first_of("(")+1;
+ end =(*aux).size()-1;
+ angle=getRadian (atof((*aux).substr(start,end-start).data()));
+ seno =sin(angle);
+ coseno =cos(angle);
+ if(matrixIsNull(a))
+ a=newMatrix(coseno,seno,-1*seno,coseno,0,0);
+ else
+ multiplyMatrix(&a,newMatrix(coseno,seno,-1*seno,coseno,0,0));
+ }else if((*aux).compare(0,6,"matrix")==0){
+ int start =(*aux).find_first_of('(')+1;
+ int end =(*aux).find_first_of(')');
+ if(matrixIsNull(a))
+ a=newMatrix((*aux).substr(start,end-start));
+ else
+ multiplyMatrix(&a,newMatrix((*aux).substr(start,end-start)));
+ }else{
+ a=newMatrix(1,0,0,1,0,0);
+ }
+ aux++;
+ }
+ return a;
+}
+
+Matrix*
+Svg_parser::newMatrix(Matrix *a){
+ Matrix* data;
+ data=(Matrix*)malloc(sizeof(Matrix));
+ data->a=a->a; data->b=a->b; data->c=a->c;
+ data->d=a->d; data->e=a->e; data->f=a->f;
+ return data;
+}
+Matrix*
+Svg_parser::newMatrix(float a,float b,float c,float d,float e,float f){
+ Matrix* data;
+ data=(Matrix*)malloc(sizeof(Matrix));
+ data->a=a; data->b=b; data->c=c;
+ data->d=d; data->e=e; data->f=f;
+ return data;
+}
+Matrix*
+Svg_parser::newMatrix(const String mvector){
+ if(!mvector.empty()){
+ std::vector<String> tokens=tokenize(mvector,",");
+ if(tokens.size()!=6) return newMatrix(1,0,0,1,0,0);
+ Matrix* data=(Matrix*)malloc(sizeof(Matrix));
+ data->a=atof(tokens.at(0).data());
+ data->b=atof(tokens.at(1).data());
+ data->c=atof(tokens.at(2).data());
+ data->d=atof(tokens.at(3).data());
+ data->e=atof(tokens.at(4).data());
+ data->f=atof(tokens.at(5).data());
+ return data;
+ }else{
+ return newMatrix(1,0,0,1,0,0);
+ }
+}
+void
+Svg_parser::transformPoint2D(Matrix *mtx,float *a,float *b){
+ float auxa,auxb;
+ auxa=0;
+ auxb=0;
+ auxa= (*a)*(mtx->a) + (*b)*(mtx->c) + (mtx->e);
+ auxb= (*a)*(mtx->b) + (*b)*(mtx->d) + (mtx->f);
+ *a=auxa;
+ *b=auxb;
+ return;
+}
+void
+Svg_parser::composeMatrix(Matrix **mtx,Matrix* mtx1,Matrix* mtx2){
+ Matrix* aux=newMatrix(0,0,0,0,0,0);
+ aux->a=(mtx1->a)*(mtx2->a)+(mtx1->c)*(mtx2->b);
+ aux->b=(mtx1->b)*(mtx2->a)+(mtx1->d)*(mtx2->b);
+ aux->c=(mtx1->a)*(mtx2->c)+(mtx1->c)*(mtx2->d);
+ aux->d=(mtx1->b)*(mtx2->c)+(mtx1->d)*(mtx2->d);
+ aux->e=(mtx1->a)*(mtx2->e)+(mtx1->c)*(mtx2->f)+(mtx1->e);
+ aux->f=(mtx1->b)*(mtx2->e)+(mtx1->d)*(mtx2->f)+(mtx1->f);
+ *mtx=aux;
+}
+void
+Svg_parser::multiplyMatrix(Matrix **mtx1,Matrix *mtx2){
+ Matrix* aux=newMatrix(0,0,0,0,0,0);
+ aux->a=((*mtx1)->a)*(mtx2->a)+((*mtx1)->c)*(mtx2->b);
+ aux->b=((*mtx1)->b)*(mtx2->a)+((*mtx1)->d)*(mtx2->b);
+ aux->c=((*mtx1)->a)*(mtx2->c)+((*mtx1)->c)*(mtx2->d);
+ aux->d=((*mtx1)->b)*(mtx2->c)+((*mtx1)->d)*(mtx2->d);
+ aux->e=((*mtx1)->a)*(mtx2->e)+((*mtx1)->c)*(mtx2->f)+((*mtx1)->e);
+ aux->f=((*mtx1)->b)*(mtx2->e)+((*mtx1)->d)*(mtx2->f)+((*mtx1)->f);
+ (*mtx1)->a=aux->a;
+ (*mtx1)->b=aux->b;
+ (*mtx1)->c=aux->c;
+ (*mtx1)->d=aux->d;
+ (*mtx1)->e=aux->e;
+ (*mtx1)->f=aux->f;
+}
+bool
+Svg_parser::matrixIsNull(Matrix *mtx){
+ if(mtx == NULL) return true;
+ return false;
+}
+
+/* === EXTRA METHODS ======================================================= */
+
int
Svg_parser::extractSubAttribute(const String attribute, String name,String* value){
int encounter=0;
return value;
}
+std::vector<String>
+Svg_parser::get_tokens_path(String path){ //mini path lexico-parser
+ std::vector<String> tokens;
+ String buffer;
+ int e=0;
+ unsigned int i=0;
+ char a;
+ while(i<path.size()){
+ a=path.at(i);
+ switch(e){
+ case 0: //initial state
+ if(a=='m'){ e=1; i++;}
+ else if(a=='c'){ e= 2; i++;}
+ else if(a=='q'){ e= 3; i++;}
+ else if(a=='t'){ e= 4; i++;}
+ else if(a=='a'){ e= 5; i++;}
+ else if(a=='l'){ e= 6; i++;}
+ else if(a=='v'){ e= 7; i++;}
+ else if(a=='h'){ e= 8; i++;}
+ else if(a=='M'){ e= 9; i++;}
+ else if(a=='C'){ e=10; i++;}
+ else if(a=='Q'){ e=11; i++;}
+ else if(a=='T'){ e=12; i++;}
+ else if(a=='A'){ e=13; i++;}
+ else if(a=='L'){ e=14; i++;}
+ else if(a=='V'){ e=15; i++;}
+ else if(a=='H'){ e=16; i++;}
+ else if(a=='z' || a=='Z'){ e=17; i++;}
+ else if(a=='-' || a=='.' || a=='e' || a=='E' || isdigit (a)){ e=18;}
+ else if(a==','){ e=19; i++;}
+ else if(a==' '){i++;}
+ break;
+ //relative
+ case 1 : tokens.push_back("m"); e=0; break;//move
+ case 2 : tokens.push_back("c"); e=0; break;//curve
+ case 3 : tokens.push_back("q"); e=0; break;//quadratic
+ case 4 : tokens.push_back("t"); e=0; break;//smooth quadratic
+ case 5 : tokens.push_back("a"); e=0; break;//elliptic arc
+ case 6 : tokens.push_back("l"); e=0; break;//line to
+ case 7 : tokens.push_back("v"); e=0; break;//vertical
+ case 8 : tokens.push_back("h"); e=0; break;//horizontal
+ //absolute
+ case 9 : tokens.push_back("M"); e=0; break;
+ case 10: tokens.push_back("C"); e=0; break;
+ case 11: tokens.push_back("Q"); e=0; break;
+ case 12: tokens.push_back("T"); e=0; break;
+ case 13: tokens.push_back("A"); e=0; break;
+ case 14: tokens.push_back("L"); e=0; break;
+ case 15: tokens.push_back("V"); e=0; break;
+ case 16: tokens.push_back("H"); e=0; break;
+
+ case 17: tokens.push_back("z"); e=0; break;//loop
+ case 18: if(a=='-' || a=='.' || a=='e' || a=='E' || isdigit (a)){
+ buffer.append(path.substr(i,1));i++;
+ }else{
+ e=20;
+ }
+ break;
+ case 19: tokens.push_back(","); e=0; break;
+ case 20: tokens.push_back(buffer);
+ buffer.clear();
+ e=0; break;
+ default: break;
+ }
+ }
+ switch(e){//last element
+ case 1 : tokens.push_back("m"); break;
+ case 2 : tokens.push_back("c"); break;
+ case 3 : tokens.push_back("q"); break;
+ case 4 : tokens.push_back("t"); break;
+ case 5 : tokens.push_back("a"); break;
+ case 6 : tokens.push_back("l"); break;
+ case 7 : tokens.push_back("v"); break;
+ case 8 : tokens.push_back("h"); break;
+ case 9 : tokens.push_back("M"); break;
+ case 10: tokens.push_back("C"); break;
+ case 11: tokens.push_back("Q"); break;
+ case 12: tokens.push_back("T"); break;
+ case 13: tokens.push_back("A"); break;
+ case 14: tokens.push_back("L"); break;
+ case 15: tokens.push_back("V"); break;
+ case 16: tokens.push_back("H"); break;
+ case 17: tokens.push_back("z"); break;
+ case 18: tokens.push_back(buffer); break;
+ case 19: tokens.push_back(","); break;
+ case 20: tokens.push_back(buffer); break;
+ default: break;
+ }
+ return tokens;
+}
+
int
Svg_parser::randomLetter(){
int a=rand()%2;
int
Svg_parser::getRed(String hex){
if(hex.at(0)=='#'){
+ //allow for 3-digit hex codes (#rgb = #rrggbb)
+ if (hex.length()<7) return (16+1) * hextodec(hex.substr(1,1));
return hextodec(hex.substr(1,2));
}else if(hex.compare(0,3,"rgb")==0 || hex.compare(0,3,"RGB")==0){
int start=hex.find_first_of("(")+1;
int
Svg_parser::getGreen(String hex){
if(hex.at(0)=='#'){
+ if (hex.length()<7) return (16+1) * hextodec(hex.substr(2,1));
return hextodec(hex.substr(3,2));
}else if(hex.compare(0,3,"rgb")==0 || hex.compare(0,3,"RGB")==0){
int start=hex.find_first_of("(")+1;
int
Svg_parser::getBlue(String hex){
if(hex.at(0)=='#'){
+ if (hex.length()<7) return (16+1) * hextodec(hex.substr(3,1));
return hextodec(hex.substr(5,2));
}else if(hex.compare(0,3,"rgb")==0 || hex.compare(0,3,"RGB")==0){
int start=hex.find_first_of("(")+1;
}
return af;
}
-//matrix operations
-Matrix*
-Svg_parser::newMatrix(Matrix *a){
- Matrix* data;
- data=(Matrix*)malloc(sizeof(Matrix));
- data->a=a->a; data->b=a->b; data->c=a->c;
- data->d=a->d; data->e=a->e; data->f=a->f;
- return data;
-}
-Matrix*
-Svg_parser::newMatrix(float a,float b,float c,float d,float e,float f){
- Matrix* data;
- data=(Matrix*)malloc(sizeof(Matrix));
- data->a=a; data->b=b; data->c=c;
- data->d=d; data->e=e; data->f=f;
- return data;
-}
-Matrix*
-Svg_parser::newMatrix(const String mvector){
- if(!mvector.empty()){
- Matrix* data=(Matrix*)malloc(sizeof(Matrix));
- std::vector<String> tokens=tokenize(mvector,",");
- if(tokens.size()!=6) return newMatrix(1,0,0,1,0,0);
- data->a=atof(tokens.at(0).data());
- data->b=atof(tokens.at(1).data());
- data->c=atof(tokens.at(2).data());
- data->d=atof(tokens.at(3).data());
- data->e=atof(tokens.at(4).data());
- data->f=atof(tokens.at(5).data());
- return data;
- }else{
- return newMatrix(1,0,0,1,0,0);
- }
-}
-void
-Svg_parser::transformPoint2D(Matrix *mtx,float *a,float *b){
- float auxa,auxb;
- auxa=0;
- auxb=0;
- auxa= (*a)*(mtx->a) + (*b)*(mtx->c) + (mtx->e);
- auxb= (*a)*(mtx->b) + (*b)*(mtx->d) + (mtx->f);
- *a=auxa;
- *b=auxb;
- return;
-}
-void
-Svg_parser::composeMatrix(Matrix **mtx,Matrix* mtx1,Matrix* mtx2){
- Matrix* aux=newMatrix(0,0,0,0,0,0);
- aux->a=(mtx1->a)*(mtx2->a)+(mtx1->c)*(mtx2->b);
- aux->b=(mtx1->b)*(mtx2->a)+(mtx1->d)*(mtx2->b);
- aux->c=(mtx1->a)*(mtx2->c)+(mtx1->c)*(mtx2->d);
- aux->d=(mtx1->b)*(mtx2->c)+(mtx1->d)*(mtx2->d);
- aux->e=(mtx1->a)*(mtx2->e)+(mtx1->c)*(mtx2->f)+(mtx1->e);
- aux->f=(mtx1->b)*(mtx2->e)+(mtx1->d)*(mtx2->f)+(mtx1->f);
- *mtx=aux;
-}
-void
-Svg_parser::multiplyMatrix(Matrix **mtx1,Matrix *mtx2){
- Matrix* aux=newMatrix(0,0,0,0,0,0);
- aux->a=((*mtx1)->a)*(mtx2->a)+((*mtx1)->c)*(mtx2->b);
- aux->b=((*mtx1)->b)*(mtx2->a)+((*mtx1)->d)*(mtx2->b);
- aux->c=((*mtx1)->a)*(mtx2->c)+((*mtx1)->c)*(mtx2->d);
- aux->d=((*mtx1)->b)*(mtx2->c)+((*mtx1)->d)*(mtx2->d);
- aux->e=((*mtx1)->a)*(mtx2->e)+((*mtx1)->c)*(mtx2->f)+((*mtx1)->e);
- aux->f=((*mtx1)->b)*(mtx2->e)+((*mtx1)->d)*(mtx2->f)+((*mtx1)->f);
- (*mtx1)->a=aux->a;
- (*mtx1)->b=aux->b;
- (*mtx1)->c=aux->c;
- (*mtx1)->d=aux->d;
- (*mtx1)->e=aux->e;
- (*mtx1)->f=aux->f;
-}
-bool
-Svg_parser::matrixIsNull(Matrix *mtx){
- if(mtx == NULL) return true;
- return false;
-}
float
Svg_parser::getRadian(float sexa){
projects / synfig.git / blobdiff