atria-soft/esvg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] change Vector2D ==> etk::Vector2D

Browse Source
This commit is contained in:
Edouard DUPIN 2012-10-26 16:58:00 +02:00
parent 8f07ec9b7c
commit 34d4ccc15f
23 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parserSVG/Base.cpp
View File

@ -109,7 +109,7 @@ void svg::Base::ParseTransform(TiXmlNode *node)
* @param[out] size parsed dimention * @param[out] size parsed dimention
* @return --- * @return ---
*/ */
void svg::Base::ParsePosition(const TiXmlNode *node, Vector2D<float> &pos, Vector2D<float> &size) void svg::Base::ParsePosition(const TiXmlNode *node, etk::Vector2D<float> &pos, etk::Vector2D<float> &size)
{ {
pos.x = 0; pos.x = 0;
pos.y = 0; pos.y = 0;
@ -435,7 +435,7 @@ draw::Color svg::Base::ParseColor(const char *inputData)
* @param[in] node standart XML node * @param[in] node standart XML node
* @return true if no problem arrived * @return true if no problem arrived
*/ */
bool svg::Base::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Base::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
SVG_ERROR("NOT IMPLEMENTED"); SVG_ERROR("NOT IMPLEMENTED");
sizeMax.x = 0; sizeMax.x = 0;

4
parserSVG/Base.h
View File

@ -55,13 +55,13 @@ namespace svg
Base(void) {}; Base(void) {};
Base(PaintState parentPaintState); Base(PaintState parentPaintState);
virtual ~Base(void) { }; virtual ~Base(void) { };
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
//specific drawing for AAG librairy ... //specific drawing for AAG librairy ...
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans) { }; virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans) { };
virtual void Display(int32_t spacing) { }; virtual void Display(int32_t spacing) { };
void ParseTransform(TiXmlNode *node); void ParseTransform(TiXmlNode *node);
void ParsePosition(const TiXmlNode *node, Vector2D<float> &pos, Vector2D<float> &size); void ParsePosition(const TiXmlNode *node, etk::Vector2D<float> &pos, etk::Vector2D<float> &size);
float ParseLength(const char *dataInput); float ParseLength(const char *dataInput);
void ParsePaintAttr(const TiXmlNode *node); void ParsePaintAttr(const TiXmlNode *node);
draw::Color ParseColor(const char *inputData); draw::Color ParseColor(const char *inputData);

2
parserSVG/Circle.cpp
View File

@ -38,7 +38,7 @@ svg::Circle::~Circle(void)
} }
bool svg::Circle::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Circle::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
m_radius = 0.0; m_radius = 0.0;
m_position.x = 0.0; m_position.x = 0.0;

4
parserSVG/Circle.h
View File

@ -32,12 +32,12 @@ namespace svg
class Circle : public svg::Base class Circle : public svg::Base
{ {
private: private:
Vector2D<float> m_position; //!< Position of the Circle etk::Vector2D<float> m_position; //!< Position of the Circle
float m_radius; //!< Radius of the Circle float m_radius; //!< Radius of the Circle
public: public:
Circle(PaintState parentPaintState); Circle(PaintState parentPaintState);
~Circle(void); ~Circle(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

2
parserSVG/Ellipse.cpp
View File

@ -37,7 +37,7 @@ svg::Ellipse::~Ellipse(void)
} }
bool svg::Ellipse::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Ellipse::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
ParseTransform(node); ParseTransform(node);
ParsePaintAttr(node); ParsePaintAttr(node);

6
parserSVG/Ellipse.h
View File

@ -32,12 +32,12 @@ namespace svg
class Ellipse : public svg::Base class Ellipse : public svg::Base
{ {
private: private:
Vector2D<float> m_c; //!< Center property of the ellipse etk::Vector2D<float> m_c; //!< Center property of the ellipse
Vector2D<float> m_r; //!< Radius property of the ellipse etk::Vector2D<float> m_r; //!< Radius property of the ellipse
public: public:
Ellipse(PaintState parentPaintState); Ellipse(PaintState parentPaintState);
~Ellipse(void); ~Ellipse(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

8
parserSVG/Group.cpp
View File

@ -46,11 +46,11 @@ svg::Group::~Group(void)
} }
bool svg::Group::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Group::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
// parse ... // parse ...
Vector2D<float> pos; etk::Vector2D<float> pos;
Vector2D<float> size; etk::Vector2D<float> size;
ParseTransform(node); ParseTransform(node);
ParsePosition(node, pos, size); ParsePosition(node, pos, size);
ParsePaintAttr(node); ParsePaintAttr(node);
@ -63,7 +63,7 @@ bool svg::Group::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2
sizeMax.x = 0; sizeMax.x = 0;
sizeMax.y = 0; sizeMax.y = 0;
Vector2D<float> tmpPos; etk::Vector2D<float> tmpPos;
// parse all sub node : // parse all sub node :
for(TiXmlNode * child = node->FirstChild(); NULL != child; child = child->NextSibling() ) { for(TiXmlNode * child = node->FirstChild(); NULL != child; child = child->NextSibling() ) {
svg::Base *elementParser = NULL; svg::Base *elementParser = NULL;

2
parserSVG/Group.h
View File

@ -37,7 +37,7 @@ namespace svg
public: public:
Group(PaintState parentPaintState); Group(PaintState parentPaintState);
~Group(void); ~Group(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

2
parserSVG/Line.cpp
View File

@ -40,7 +40,7 @@ svg::Line::~Line(void)
} }
bool svg::Line::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Line::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
// line must have a minimum size... // line must have a minimum size...
m_paint.strokeWidth = 1; m_paint.strokeWidth = 1;

6
parserSVG/Line.h
View File

@ -32,12 +32,12 @@ namespace svg
class Line : public svg::Base class Line : public svg::Base
{ {
private: private:
Vector2D<float> m_startPos; //!< Start line position etk::Vector2D<float> m_startPos; //!< Start line position
Vector2D<float> m_stopPos; //!< Stop line position etk::Vector2D<float> m_stopPos; //!< Stop line position
public: public:
Line(PaintState parentPaintState); Line(PaintState parentPaintState);
~Line(void); ~Line(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

2
parserSVG/Path.cpp
View File

@ -78,7 +78,7 @@ const char * extractCmd(const char * input, char& cmd, etk::Vector<float>& outpu
return outputPointer; return outputPointer;
} }
bool svg::Path::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Path::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
ParseTransform(node); ParseTransform(node);
ParsePaintAttr(node); ParsePaintAttr(node);

2
parserSVG/Path.h
View File

@ -56,7 +56,7 @@ namespace svg
public: public:
Path(PaintState parentPaintState); Path(PaintState parentPaintState);
~Path(void); ~Path(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
private: private:

4
parserSVG/Polygon.cpp
View File

@ -37,7 +37,7 @@ svg::Polygon::~Polygon(void)
} }
bool svg::Polygon::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Polygon::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
ParseTransform(node); ParseTransform(node);
ParsePaintAttr(node); ParsePaintAttr(node);
@ -58,7 +58,7 @@ bool svg::Polygon::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vecto
sizeMax.y = 0; sizeMax.y = 0;
SVG_VERBOSE("Parse polygon : \"" << sss << "\""); SVG_VERBOSE("Parse polygon : \"" << sss << "\"");
while ('\0' != sss[0]) { while ('\0' != sss[0]) {
Vector2D<float> pos; etk::Vector2D<float> pos;
int32_t n; int32_t n;
if (sscanf(sss, "%f,%f%n", &pos.x, &pos.y, &n) == 2) { if (sscanf(sss, "%f,%f%n", &pos.x, &pos.y, &n) == 2) {
m_listPoint.PushBack(pos); m_listPoint.PushBack(pos);

4
parserSVG/Polygon.h
View File

@ -37,12 +37,12 @@ namespace svg
class Polygon : public svg::Base class Polygon : public svg::Base
{ {
private: private:
etk::Vector<Vector2D<float> > m_listPoint; //!< list of all point of the polygone etk::Vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polygone
PolygonMode_te m_diplayMode; //!< polygone specific display mode PolygonMode_te m_diplayMode; //!< polygone specific display mode
public: public:
Polygon(PaintState parentPaintState); Polygon(PaintState parentPaintState);
~Polygon(void); ~Polygon(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

4
parserSVG/Polyline.cpp
View File

@ -37,7 +37,7 @@ svg::Polyline::~Polyline(void)
} }
bool svg::Polyline::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Polyline::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
// line must have a minimum size... // line must have a minimum size...
m_paint.strokeWidth = 1; m_paint.strokeWidth = 1;
@ -56,7 +56,7 @@ bool svg::Polyline::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vect
sizeMax.y = 0; sizeMax.y = 0;
SVG_VERBOSE("Parse polyline : \"" << sss << "\""); SVG_VERBOSE("Parse polyline : \"" << sss << "\"");
while ('\0' != sss[0]) { while ('\0' != sss[0]) {
Vector2D<float> pos; etk::Vector2D<float> pos;
int32_t n; int32_t n;
if (sscanf(sss, "%f,%f %n", &pos.x, &pos.y, &n) == 2) { if (sscanf(sss, "%f,%f %n", &pos.x, &pos.y, &n) == 2) {
m_listPoint.PushBack(pos); m_listPoint.PushBack(pos);

4
parserSVG/Polyline.h
View File

@ -33,11 +33,11 @@ namespace svg
class Polyline : public svg::Base class Polyline : public svg::Base
{ {
private: private:
etk::Vector<Vector2D<float> > m_listPoint; //!< list of all point of the polyline etk::Vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polyline
public: public:
Polyline(PaintState parentPaintState); Polyline(PaintState parentPaintState);
~Polyline(void); ~Polyline(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

2
parserSVG/Rectangle.cpp
View File

@ -42,7 +42,7 @@ svg::Rectangle::~Rectangle(void)
} }
bool svg::Rectangle::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Rectangle::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
m_position.x = 0.0; m_position.x = 0.0;
m_position.y = 0.0; m_position.y = 0.0;

8
parserSVG/Rectangle.h
View File

@ -32,13 +32,13 @@ namespace svg
class Rectangle : public svg::Base class Rectangle : public svg::Base
{ {
private: private:
Vector2D<float> m_position; //!< position of the rectangle etk::Vector2D<float> m_position; //!< position of the rectangle
Vector2D<float> m_size; //!< size of the rectangle etk::Vector2D<float> m_size; //!< size of the rectangle
Vector2D<float> m_roundedCorner; //!< property of the rounded corner etk::Vector2D<float> m_roundedCorner; //!< property of the rounded corner
public: public:
Rectangle(PaintState parentPaintState); Rectangle(PaintState parentPaintState);
~Rectangle(void); ~Rectangle(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
}; };

16
parserSVG/Renderer.h
View File

@ -54,13 +54,13 @@ namespace svg
class PaintState { class PaintState {
public: public:
draw::Color fill; draw::Color fill;
draw::Color stroke; draw::Color stroke;
float strokeWidth; float strokeWidth;
bool flagEvenOdd; bool flagEvenOdd;
lineCap_te lineCap; lineCap_te lineCap;
lineJoin_te lineJoin; lineJoin_te lineJoin;
Vector2D<float> viewPort; etk::Vector2D<float> viewPort;
}; };
// basic definition type for the renderer // basic definition type for the renderer
@ -75,7 +75,7 @@ namespace svg
Renderer(uint32_t width, uint32_t height); Renderer(uint32_t width, uint32_t height);
~Renderer(void); ~Renderer(void);
void WritePpm(etk::UString fileName); void WritePpm(etk::UString fileName);
Vector2D<float> m_size; etk::Vector2D<float> m_size;
agg::rendering_buffer * m_renderingBuffer; agg::rendering_buffer * m_renderingBuffer;
agg::pixfmt_rgba32 * m_pixFrame; agg::pixfmt_rgba32 * m_pixFrame;
rendererBase_t * m_renderBase; rendererBase_t * m_renderBase;

2
parserSVG/Text.cpp
View File

@ -35,7 +35,7 @@ svg::Text::~Text(void)
} }
bool svg::Text::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax) bool svg::Text::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax)
{ {
sizeMax.x = 0; sizeMax.x = 0;
sizeMax.y = 0; sizeMax.y = 0;

2
parserSVG/Text.h
View File

@ -36,7 +36,7 @@ namespace svg
public: public:
Text(PaintState parentPaintState); Text(PaintState parentPaintState);
~Text(void); ~Text(void);
virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, Vector2D<float>& sizeMax); virtual bool Parse(TiXmlNode * node, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void Display(int32_t spacing); virtual void Display(int32_t spacing);
}; };
}; };

8
parserSVG/parserSVG.cpp
View File

@ -111,18 +111,18 @@ svg::Parser::Parser(etk::File fileName) : m_renderedElement(NULL)
m_version = version; m_version = version;
} }
// parse ... // parse ...
Vector2D<float> pos; etk::Vector2D<float> pos;
ParseTransform(root); ParseTransform(root);
ParsePosition(root, pos, m_size); ParsePosition(root, pos, m_size);
ParsePaintAttr(root); ParsePaintAttr(root);
SVG_VERBOSE("parsed .ROOT trans : (" << m_transformMatrix.sx << "," << m_transformMatrix.shy << "," << m_transformMatrix.shx << "," << m_transformMatrix.sy << "," << m_transformMatrix.tx << "," << m_transformMatrix.ty << ")"); SVG_VERBOSE("parsed .ROOT trans : (" << m_transformMatrix.sx << "," << m_transformMatrix.shy << "," << m_transformMatrix.shx << "," << m_transformMatrix.sy << "," << m_transformMatrix.tx << "," << m_transformMatrix.ty << ")");
Vector2D<float> maxSize; etk::Vector2D<float> maxSize;
maxSize.x = 0.0; maxSize.x = 0.0;
maxSize.y = 0.0; maxSize.y = 0.0;
Vector2D<float> size; etk::Vector2D<float> size;
// parse all sub node : // parse all sub node :
for(TiXmlNode * child = root->FirstChild(); NULL != child; child = child->NextSibling() ) { for(TiXmlNode * child = root->FirstChild(); NULL != child; child = child->NextSibling() ) {
svg::Base *elementParser = NULL; svg::Base *elementParser = NULL;
@ -298,7 +298,7 @@ void svg::Parser::GenerateAnImage(int32_t sizeX, int32_t sizeY)
*/ */
} }
void svg::Parser::GenerateAnImage(Vector2D<int32_t> size, draw::Image& output) void svg::Parser::GenerateAnImage(etk::Vector2D<int32_t> size, draw::Image& output)
{ {
GenerateAnImage(size.x, size.y); GenerateAnImage(size.x, size.y);
output.Resize(size); output.Resize(size);

8
parserSVG/parserSVG.h
View File

@ -25,7 +25,7 @@
#ifndef __SVG_PARSER_H__ #ifndef __SVG_PARSER_H__
#define __SVG_PARSER_H__ #define __SVG_PARSER_H__
#include <etk/File.h> #include <etk/os/File.h>
#include <etk/Vector.h> #include <etk/Vector.h>
#include <parserSVG/Base.h> #include <parserSVG/Base.h>
#include <draw/Image.h> #include <draw/Image.h>
@ -40,7 +40,7 @@ namespace svg
etk::UString m_version; etk::UString m_version;
etk::UString m_title; etk::UString m_title;
etk::Vector<svg::Base *> m_subElementList; etk::Vector<svg::Base *> m_subElementList;
Vector2D<float> m_size; etk::Vector2D<float> m_size;
svg::Renderer* m_renderedElement; svg::Renderer* m_renderedElement;
public: public:
@ -50,11 +50,11 @@ namespace svg
void DisplayDebug(void); void DisplayDebug(void);
void GenerateTestFile(void); void GenerateTestFile(void);
void GenerateAnImage(int32_t sizeX, int32_t sizeY); void GenerateAnImage(int32_t sizeX, int32_t sizeY);
void GenerateAnImage(Vector2D<int32_t> size, draw::Image& output); void GenerateAnImage(etk::Vector2D<int32_t> size, draw::Image& output);
virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void AggDraw(svg::Renderer& myRenderer, agg::trans_affine& basicTrans);
uint8_t* GetPointerOnData(void); uint8_t* GetPointerOnData(void);
uint32_t GetSizeOnData(void); uint32_t GetSizeOnData(void);
Vector2D<float> GetDefinedSize(void) { return m_size;}; etk::Vector2D<float> GetDefinedSize(void) { return m_size;};
}; };
}; };