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

[DEV] coding style

Browse Source
This commit is contained in:
Edouard DUPIN 2013-10-04 21:47:09 +02:00
parent ed0661317b
commit 3970e69698
2 changed files with 120 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
draw/Image.cpp
View File

@ -36,10 +36,10 @@ draw::Image::Image(void) :
{ {
m_size.setX(32); m_size.setX(32);
m_size.setY(32); m_size.setY(32);
Init(); init();
} }
draw::Image::Image(ivec2 size) : draw::Image::Image(ivec2 _size) :
m_renderingBuffer(NULL), m_renderingBuffer(NULL),
m_pixFrame(NULL), m_pixFrame(NULL),
m_renderBase(NULL), m_renderBase(NULL),
@ -48,11 +48,11 @@ draw::Image::Image(ivec2 size) :
m_strokeColor(0,0,0,0), m_strokeColor(0,0,0,0),
m_strokeSize(0) m_strokeSize(0)
{ {
m_size = size; m_size = _size;
Init(); init();
} }
void draw::Image::Init(void) void draw::Image::init(void)
{ {
// basic element : // basic element :
draw::Color tmpBg(0,0,0,0); draw::Color tmpBg(0,0,0,0);
@ -120,7 +120,7 @@ draw::Image::~Image(void)
} }
} }
void draw::Image::Resize(ivec2 size) void draw::Image::resize(ivec2 size)
{ {
if (NULL != m_renderArea) { if (NULL != m_renderArea) {
delete(m_renderArea); delete(m_renderArea);
@ -186,37 +186,37 @@ void draw::Image::Resize(ivec2 size)
} }
void draw::Image::Begin(void) void draw::Image::begin(void)
{ {
} }
void draw::Image::End(void) void draw::Image::end(void)
{ {
} }
void draw::Image::MoveTo(vec2 pos) void draw::Image::moveTo(vec2 pos)
{ {
} }
void draw::Image::MoveToAbs(vec2 pos) void draw::Image::moveToAbs(vec2 pos)
{ {
} }
void draw::Image::LineTo(vec2 pos) void draw::Image::lineTo(vec2 pos)
{ {
} }
void draw::Image::LineToAbs(vec2 pos) void draw::Image::lineToAbs(vec2 pos)
{ {
} }
// link the curent line with his start // link the curent line with his start
void draw::Image::Join(void) void draw::Image::join(void)
{ {
} }
@ -226,7 +226,7 @@ void draw::Image::draw(void)
} }
void draw::Image::Dot(vec2 pos) void draw::Image::dot(vec2 pos)
{ {
/* /*
Begin(); Begin();
@ -237,35 +237,35 @@ void draw::Image::Dot(vec2 pos)
set(pos, m_fillColor); set(pos, m_fillColor);
} }
void draw::Image::Line(vec2 posStart, vec2 posEnd) void draw::Image::line(vec2 posStart, vec2 posEnd)
{ {
Begin(); begin();
MoveTo(posStart); moveTo(posStart);
LineTo(posEnd); lineTo(posEnd);
End(); end();
} }
void draw::Image::Rectangle(vec2 pos, vec2 size) void draw::Image::rectangle(vec2 pos, vec2 size)
{ {
Begin(); begin();
vec2 tmp = pos; vec2 tmp = pos;
MoveTo(pos); moveTo(pos);
tmp += vec2(size.x(),0); tmp += vec2(size.x(),0);
LineTo(tmp); lineTo(tmp);
tmp += vec2(0,size.y()); tmp += vec2(0,size.y());
LineTo(tmp); lineTo(tmp);
tmp -= vec2(size.x(),0); tmp -= vec2(size.x(),0);
LineTo(tmp); lineTo(tmp);
Join(); join();
End(); end();
} }
void draw::Image::Circle(vec2 pos, float radius, float angleStart, float angleStop) void draw::Image::circle(vec2 pos, float radius, float angleStart, float angleStop)
{ {
} }
void draw::Image::Disc(vec2 pos, float radius, float angleStart, float angleStop) void draw::Image::disc(vec2 pos, float radius, float angleStart, float angleStop)
{ {
} }
@ -310,14 +310,14 @@ void Grid::generateSDF()
// see : http://www.codersnotes.com/notes/signed-distance-fields // see : http://www.codersnotes.com/notes/signed-distance-fields
void draw::Image::DistanceField(void) void draw::Image::distanceField(void)
{ {
DistanceField(ivec2(0,0), m_size); distanceField(ivec2(0,0), m_size);
} }
#endif #endif
#define META_DIST (8) #define META_DIST (8)
void draw::Image::DistanceField(ivec2 pos, ivec2 size, int32_t upscaler, int32_t startPos) void draw::Image::distanceField(ivec2 pos, ivec2 size, int32_t upscaler, int32_t startPos)
{ {
#ifndef BASIC_GRADIENT #ifndef BASIC_GRADIENT
float maxVal = 1/(1000.0*sqrtf(META_DIST*META_DIST+META_DIST*META_DIST)); float maxVal = 1/(1000.0*sqrtf(META_DIST*META_DIST+META_DIST*META_DIST));

162
draw/Image.h
View File

@ -53,9 +53,8 @@ class Grid
etk::Vector<int32_t> m_data; etk::Vector<int32_t> m_data;
int32_t m_outsideVal; int32_t m_outsideVal;
int32_t m_errorVal; int32_t m_errorVal;
Grid(ivec2 size) Grid(ivec2 _size) {
{ m_size = _size;
m_size = size;
m_outsideVal = 20; m_outsideVal = 20;
m_errorVal = 0; m_errorVal = 0;
// basic element : // basic element :
@ -64,59 +63,51 @@ class Grid
m_data.reSize(m_size.x()*m_size.y(), tmpPoint); m_data.reSize(m_size.x()*m_size.y(), tmpPoint);
}; };
~Grid(void) { }; ~Grid(void) { };
void setOutsideVal(int32_t newVal) void setOutsideVal(int32_t _newVal) {
{ m_outsideVal = _newVal;
m_outsideVal = newVal;
} }
void setErrorVal(int32_t newVal) void setErrorVal(int32_t _newVal) {
{ m_errorVal = _newVal;
m_errorVal = newVal;
} }
void setInide(etk::Vector2D<int32_t> pos) void setInide(etk::Vector2D<int32_t> _pos) {
{ if( _pos.x()>=0 && _pos.x()<m_size.x()
if( pos.x()>=0 && pos.x()<m_size.x() && _pos.y()>=0 && _pos.y()<m_size.y()) {
&& pos.y()>=0 && pos.y()<m_size.y()) { m_data[_pos.x()+_pos.y()*m_size.x()]=0;
m_data[pos.x()+pos.y()*m_size.x()]=0;
} }
}; };
void setOutside(etk::Vector2D<int32_t> pos) void setOutside(etk::Vector2D<int32_t> _pos) {
{ if( _pos.x()>=0 && _pos.x()<m_size.x()
if( pos.x()>=0 && pos.x()<m_size.x() && _pos.y()>=0 && _pos.y()<m_size.y()) {
&& pos.y()>=0 && pos.y()<m_size.y()) { m_data[_pos.x()+_pos.y()*m_size.x()]=m_outsideVal;
m_data[pos.x()+pos.y()*m_size.x()]=m_outsideVal;
} }
}; };
int32_t get(etk::Vector2D<int32_t> pos) int32_t get(etk::Vector2D<int32_t> _pos) {
{
; ;
if( pos.x()>0 && pos.x()<m_size.x() if( _pos.x()>0 && _pos.x()<m_size.x()
&& pos.y()>0 && pos.y()<m_size.y()) { && _pos.y()>0 && _pos.y()<m_size.y()) {
return m_data[pos.x()+pos.y()*m_size.x()]; return m_data[_pos.x()+_pos.y()*m_size.x()];
} }
return m_errorVal; return m_errorVal;
}; };
void set(etk::Vector2D<int32_t> pos, int32_t val) void set(etk::Vector2D<int32_t> _pos, int32_t _val) {
{ if( _pos.x()>0 && _pos.x()<m_size.x()
if( pos.x()>0 && pos.x()<m_size.x() && _pos.y()>0 && _pos.y()<m_size.y()) {
&& pos.y()>0 && pos.y()<m_size.y()) { m_data[_pos.x()+_pos.y()*m_size.x()] = _val;
m_data[pos.x()+pos.y()*m_size.x()] = val;
} }
}; };
}; };
#else #else
class Grid class Grid {
{
public: public:
ivec2 m_size; ivec2 m_size;
etk::Vector<ivec2> m_data; etk::Vector<ivec2> m_data;
int32_t m_outsideVal; int32_t m_outsideVal;
int32_t m_errorVal; int32_t m_errorVal;
Grid(ivec2 size) Grid(ivec2 _size) {
{ m_size = _size;
m_size = size;
m_outsideVal = 20; m_outsideVal = 20;
m_errorVal = 0; m_errorVal = 0;
// basic element : // basic element :
@ -125,55 +116,48 @@ class Grid
m_data.reSize(m_size.x()*m_size.y(), tmpPoint); m_data.reSize(m_size.x()*m_size.y(), tmpPoint);
}; };
~Grid(void) { }; ~Grid(void) { };
void setOutsideVal(int32_t newVal) void setOutsideVal(int32_t _newVal) {
{ m_outsideVal = _newVal;
m_outsideVal = newVal;
} }
void setErrorVal(int32_t newVal) void setErrorVal(int32_t _newVal) {
{ m_errorVal = _newVal;
m_errorVal = newVal;
} }
void setInide(ivec2 pos) void setInide(ivec2 _pos) {
{
//if( pos.x>=0 && pos.x<m_size.x //if( pos.x>=0 && pos.x<m_size.x
// && pos.y>=0 && pos.y<m_size.y) { // && pos.y>=0 && pos.y<m_size.y) {
m_data[pos.x()+pos.y()*m_size.x()].setX(0); m_data[_pos.x()+_pos.y()*m_size.x()].setX(0);
m_data[pos.x()+pos.y()*m_size.x()].setY(0); m_data[_pos.x()+_pos.y()*m_size.x()].setY(0);
//} //}
}; };
void setOutside(ivec2 pos) void setOutside(ivec2 _pos) {
{
//if( pos.x>=0 && pos.x<m_size.x //if( pos.x>=0 && pos.x<m_size.x
// && pos.y>=0 && pos.y<m_size.y) { // && pos.y>=0 && pos.y<m_size.y) {
m_data[pos.x()+pos.y()*m_size.x()].setX(m_outsideVal); m_data[_pos.x()+_pos.y()*m_size.x()].setX(m_outsideVal);
m_data[pos.x()+pos.y()*m_size.x()].setY(m_outsideVal); m_data[_pos.x()+_pos.y()*m_size.x()].setY(m_outsideVal);
//} //}
}; };
ivec2 get(ivec2 pos) ivec2 get(ivec2 _pos) {
{ //if( _pos.x>0 && _pos.x<m_size.x
//if( pos.x>0 && pos.x<m_size.x // && _pos.y>0 && _pos.y<m_size.y) {
// && pos.y>0 && pos.y<m_size.y) { return m_data[_pos.x()+_pos.y()*m_size.x()];
return m_data[pos.x()+pos.y()*m_size.x()];
//} //}
//return etk::Vector2D<int32_t>(m_errorVal,m_errorVal); //return etk::Vector2D<int32_t>(m_errorVal,m_errorVal);
}; };
void set(ivec2 pos, ivec2 val) void set(ivec2 _pos, ivec2 _val) {
{
//if( pos.x>0 && pos.x<m_size.x //if( pos.x>0 && pos.x<m_size.x
// && pos.y>0 && pos.y<m_size.y) { // && pos.y>0 && pos.y<m_size.y) {
m_data[pos.x()+pos.y()*m_size.x()] = val; m_data[_pos.x()+_pos.y()*m_size.x()] = _val;
//} //}
}; };
void Compare(ivec2 &p, ivec2 pos, int32_t offsetx, int32_t offsety ) void Compare(ivec2 &_p, ivec2 _pos, int32_t _offsetx, int32_t _offsety ) {
{ _pos += ivec2(_offsetx,_offsety);
pos += ivec2(offsetx,offsety); ivec2 other = get(_pos);
ivec2 other = get(pos); other += ivec2(_offsetx,_offsety);
other += ivec2(offsetx,offsety); if (other.dot(_p) < _p.dot(_p)) {
if (other.dot(p) < p.dot(p)) { _p = other;
p = other;
} }
}; };
void generateSDF(void); void generateSDF(void);
@ -209,7 +193,7 @@ namespace draw
// destructor // destructor
~Image(void); ~Image(void);
// initialiser // initialiser
void Init(void); void init(void);
// EWOL internal API for Texture system : // EWOL internal API for Texture system :
public: public:
@ -219,19 +203,16 @@ namespace draw
// -- basic tools : // -- basic tools :
// ----------------------------------------------- // -----------------------------------------------
public : public :
void Resize(ivec2 size); void resize(ivec2 size);
//void Resize(etk::Vector2D<int32_t> startPos, Vector2D<int32_t> size); //void Resize(etk::Vector2D<int32_t> startPos, Vector2D<int32_t> size);
ivec2 getSize(void) const ivec2 getSize(void) const {
{
return m_size; return m_size;
}; };
int32_t getWidth(void) const int32_t getWidth(void) const {
{
return m_size.x(); return m_size.x();
}; };
int32_t getHeight(void) const int32_t getHeight(void) const {
{
return m_size.y(); return m_size.y();
}; };
@ -242,8 +223,7 @@ namespace draw
//void Zoom(float coefficient); //void Zoom(float coefficient);
void clear(void) void clear(void) {
{
for (int32_t iii=0; iii<m_size.x()*m_size.y(); iii++) { for (int32_t iii=0; iii<m_size.x()*m_size.y(); iii++) {
m_data[iii] = m_fillColor; m_data[iii] = m_fillColor;
} }
@ -253,8 +233,7 @@ namespace draw
//Image & operator= (const Image &image) //Image & operator= (const Image &image)
draw::Color get(ivec2 pos) draw::Color get(ivec2 pos) {
{
draw::Color outColor(0x00000000); draw::Color outColor(0x00000000);
if( pos.x()>0 && pos.x()<m_size.x() if( pos.x()>0 && pos.x()<m_size.x()
&& pos.y()>0 && pos.y()<m_size.y()) { && pos.y()>0 && pos.y()<m_size.y()) {
@ -263,8 +242,7 @@ namespace draw
return outColor; return outColor;
} }
void set(ivec2 pos, draw::Color newColor) void set(ivec2 pos, draw::Color newColor) {
{
if( pos.x()>=0 && pos.x()<m_size.x() if( pos.x()>=0 && pos.x()<m_size.x()
&& pos.y()>=0 && pos.y()<m_size.y()) { && pos.y()>=0 && pos.y()<m_size.y()) {
m_data[pos.x()+pos.y()*m_size.x()] = newColor; m_data[pos.x()+pos.y()*m_size.x()] = newColor;
@ -279,8 +257,8 @@ namespace draw
// -- drawing tools : // -- drawing tools :
// ----------------------------------------------- // -----------------------------------------------
public : public :
void Begin(void); void begin(void);
void End(void); void end(void);
void setFillColor(draw::Color newColor) { void setFillColor(draw::Color newColor) {
m_fillColor = newColor; m_fillColor = newColor;
} }
@ -290,23 +268,23 @@ namespace draw
void setStrokeSize(float thickness) { void setStrokeSize(float thickness) {
m_strokeSize = thickness; m_strokeSize = thickness;
} }
void MoveTo(vec2 pos); void moveTo(vec2 pos);
void MoveToAbs(vec2 pos); void moveToAbs(vec2 pos);
void LineTo(vec2 pos); void lineTo(vec2 pos);
void LineToAbs(vec2 pos); void lineToAbs(vec2 pos);
void Join(void); void join(void);
void draw(void); void draw(void);
void Line(vec2 posStart, vec2 posEnd); void line(vec2 posStart, vec2 posEnd);
void Dot(vec2 pos); void dot(vec2 pos);
void Rectangle(vec2 pos, vec2 size); void rectangle(vec2 pos, vec2 size);
void Circle(vec2 pos, float radius, float angleStart=0, float angleStop=2*M_PI); void circle(vec2 pos, float radius, float angleStart=0, float angleStop=2*M_PI);
void Disc(vec2 pos, float radius, float angleStart=0, float angleStop=2*M_PI); void disc(vec2 pos, float radius, float angleStart=0, float angleStop=2*M_PI);
// generate the distant field from the alpha value of the Image // generate the distant field from the alpha value of the Image
void DistanceField(void); void distanceField(void);
void DistanceField(ivec2 pos, ivec2 size, int32_t upscaler=1, int32_t startPos=0); void distanceField(ivec2 pos, ivec2 size, int32_t upscaler=1, int32_t startPos=0);
void SaveFile(const char * file) {}; void saveFile(const char * file) {};
private: private: