Refractor Vertice->Vertex

[synfig.git] / synfig-core / src / modules / mod_svg / svg_parser.h

diff --git a/synfig-core/src/modules/mod_svg/svg_parser.h b/synfig-core/src/modules/mod_svg/svg_parser.h
index 54e57b0..53b8582 100644 (file)
--- a/synfig-core/src/modules/mod_svg/svg_parser.h
+++ b/synfig-core/src/modules/mod_svg/svg_parser.h
@@ -84,12 +84,20 @@ typedef struct url_t{
        void* data;
 }URL;
 
-typedef struct vertice_t{
+typedef struct Vertex_t{
        float x,y;
        float radius1,angle1;
        float radius2,angle2;
        bool split;
-}Vertice;
+}Vertex;
+
+typedef struct bline_t{
+       std::list<Vertex*> *points;
+       bool loop;
+       String* bline_id;
+       String* offset_id;
+}BLine;
+
 class Svg_parser
 {
                //this is inkscape oriented in some cases
@@ -108,7 +116,6 @@ private:
                int uid;
                int kux,set_canvas;
                float ox,oy;
-               bool loop;//aux :D
                //urls
                std::list<LinearGradient*> lg;
                std::list<RadialGradient*> rg;
@@ -131,8 +138,8 @@ private:
                void parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx);
                void parser_rect(const xmlpp::Element* nodeElement,xmlpp::Element* root,String fill, String fill_opacity, String opacity);
                /* === CONVERT TO PATH PARSERS ==================== */
-               std::list<std::list<Vertice*> > parser_path_polygon(Glib::ustring polygon_points, Matrix* mtx);
-               std::list<std::list<Vertice*> > parser_path_d(String path_d,Matrix* mtx);
+               std::list<BLine *> parser_path_polygon(Glib::ustring polygon_points, Matrix* mtx);
+               std::list<BLine *> parser_path_d(String path_d,Matrix* mtx);
 
                /* === EFFECTS PARSERS ============================ */
                void parser_effects(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx);
@@ -144,6 +151,7 @@ private:
                ColorStop* newColorStop(String color,float opacity,float pos);
                LinearGradient* newLinearGradient(String name,float x1,float y1, float x2,float y2,std::list<ColorStop*> *stops, Matrix* transform);
                RadialGradient* newRadialGradient(String name,float cx,float cy,float r,std::list<ColorStop*> *stops, Matrix* transform);
+               BLine* newBLine(std::list<Vertex*> *points,bool loop);
 
                /* === BUILDS ===================================== */
                void build_transform(xmlpp::Element* root,Matrix* mtx);
@@ -158,9 +166,9 @@ private:
                void build_gamma(xmlpp::Element* root,float gamma);
                void build_rotate(xmlpp::Element* root,float dx,float dy,float angle);
                void build_translate(xmlpp::Element* root,float dx,float dy);
-               void build_points(xmlpp::Element* root,std::list<Vertice*> p);
-               void build_vertice(xmlpp::Element* root , Vertice *p);
-               void build_bline(xmlpp::Element* root,std::list<Vertice*> p,bool loop,String blinegui);
+               void build_points(xmlpp::Element* root,std::list<Vertex*> p);
+               void build_Vertex(xmlpp::Element* root , Vertex *p);
+               void build_bline(xmlpp::Element* root,std::list<Vertex*> p,bool loop,String blinegui);
                void build_param (xmlpp::Element* root,String name,String type,String value);
                void build_param (xmlpp::Element* root,String name,String type,float value);
                void build_param (xmlpp::Element* root,String name,String type,int value);
@@ -175,11 +183,11 @@ private:
 
                //points,etc
                void coor2vect(float *x,float *y);
-               void setTg2(Vertice* p,float p1x,float p1y,float p2x,float p2y);
-               void setTg1(Vertice *p,float p1x,float p1y,float p2x,float p2y);
-               void setSplit(Vertice* p,bool val);
-               int isFirst(Vertice* nodo,float a, float b);
-               Vertice* newVertice(float x,float y);
+               void setTg2(Vertex* p,float p1x,float p1y,float p2x,float p2y);
+               void setTg1(Vertex *p,float p1x,float p1y,float p2x,float p2y);
+               void setSplit(Vertex* p,bool val);
+               int isFirst(Vertex* nodo,float a, float b);
+               Vertex* newVertex(float x,float y);
 
                //matrix operations
                Matrix* parser_transform(const String transform);