From 3970e6969827ec485bdf260f003653f27d1e8749 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 4 Oct 2013 21:47:09 +0200 Subject: [PATCH] [DEV] coding style --- draw/Image.cpp | 64 ++++++++-------- draw/Image.h | 198 ++++++++++++++++++++++--------------------------- 2 files changed, 120 insertions(+), 142 deletions(-) diff --git a/draw/Image.cpp b/draw/Image.cpp index 2aa8412..6f9393d 100644 --- a/draw/Image.cpp +++ b/draw/Image.cpp @@ -36,10 +36,10 @@ draw::Image::Image(void) : { m_size.setX(32); m_size.setY(32); - Init(); + init(); } -draw::Image::Image(ivec2 size) : +draw::Image::Image(ivec2 _size) : m_renderingBuffer(NULL), m_pixFrame(NULL), m_renderBase(NULL), @@ -48,11 +48,11 @@ draw::Image::Image(ivec2 size) : m_strokeColor(0,0,0,0), m_strokeSize(0) { - m_size = size; - Init(); + m_size = _size; + init(); } -void draw::Image::Init(void) +void draw::Image::init(void) { // basic element : 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) { 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 -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(); @@ -237,35 +237,35 @@ void draw::Image::Dot(vec2 pos) set(pos, m_fillColor); } -void draw::Image::Line(vec2 posStart, vec2 posEnd) +void draw::Image::line(vec2 posStart, vec2 posEnd) { - Begin(); - MoveTo(posStart); - LineTo(posEnd); - End(); + begin(); + moveTo(posStart); + lineTo(posEnd); + end(); } -void draw::Image::Rectangle(vec2 pos, vec2 size) +void draw::Image::rectangle(vec2 pos, vec2 size) { - Begin(); + begin(); vec2 tmp = pos; - MoveTo(pos); + moveTo(pos); tmp += vec2(size.x(),0); - LineTo(tmp); + lineTo(tmp); tmp += vec2(0,size.y()); - LineTo(tmp); + lineTo(tmp); tmp -= vec2(size.x(),0); - LineTo(tmp); - Join(); - End(); + lineTo(tmp); + join(); + 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 -void draw::Image::DistanceField(void) +void draw::Image::distanceField(void) { - DistanceField(ivec2(0,0), m_size); + distanceField(ivec2(0,0), m_size); } #endif #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 float maxVal = 1/(1000.0*sqrtf(META_DIST*META_DIST+META_DIST*META_DIST)); diff --git a/draw/Image.h b/draw/Image.h index 4f912a8..5c7beaf 100644 --- a/draw/Image.h +++ b/draw/Image.h @@ -49,13 +49,12 @@ class Grid { public: - etk::Vector2D m_size; - etk::Vector m_data; - int32_t m_outsideVal; - int32_t m_errorVal; - Grid(ivec2 size) - { - m_size = size; + etk::Vector2D m_size; + etk::Vector m_data; + int32_t m_outsideVal; + int32_t m_errorVal; + Grid(ivec2 _size) { + m_size = _size; m_outsideVal = 20; m_errorVal = 0; // basic element : @@ -64,59 +63,51 @@ class Grid m_data.reSize(m_size.x()*m_size.y(), tmpPoint); }; ~Grid(void) { }; - void setOutsideVal(int32_t newVal) - { - m_outsideVal = newVal; + void setOutsideVal(int32_t _newVal) { + m_outsideVal = _newVal; } - void setErrorVal(int32_t newVal) - { - m_errorVal = newVal; + void setErrorVal(int32_t _newVal) { + m_errorVal = _newVal; } - void setInide(etk::Vector2D pos) - { - if( pos.x()>=0 && pos.x()=0 && pos.y() _pos) { + if( _pos.x()>=0 && _pos.x()=0 && _pos.y() pos) - { - if( pos.x()>=0 && pos.x()=0 && pos.y() _pos) { + if( _pos.x()>=0 && _pos.x()=0 && _pos.y() pos) - { + int32_t get(etk::Vector2D _pos) { ; - if( pos.x()>0 && pos.x()0 && pos.y()0 && _pos.x()0 && _pos.y() pos, int32_t val) - { - if( pos.x()>0 && pos.x()0 && pos.y() _pos, int32_t _val) { + if( _pos.x()>0 && _pos.x()0 && _pos.y() m_data; - int32_t m_outsideVal; - int32_t m_errorVal; - Grid(ivec2 size) - { - m_size = size; + ivec2 m_size; + etk::Vector m_data; + int32_t m_outsideVal; + int32_t m_errorVal; + Grid(ivec2 _size) { + m_size = _size; m_outsideVal = 20; m_errorVal = 0; // basic element : @@ -125,55 +116,48 @@ class Grid m_data.reSize(m_size.x()*m_size.y(), tmpPoint); }; ~Grid(void) { }; - void setOutsideVal(int32_t newVal) - { - m_outsideVal = newVal; + void setOutsideVal(int32_t _newVal) { + m_outsideVal = _newVal; } - void setErrorVal(int32_t newVal) - { - m_errorVal = newVal; + void setErrorVal(int32_t _newVal) { + m_errorVal = _newVal; } - void setInide(ivec2 pos) - { + void setInide(ivec2 _pos) { //if( pos.x>=0 && pos.x=0 && pos.y=0 && pos.x=0 && pos.y0 && pos.x0 && pos.y0 && _pos.x0 && _pos.y(m_errorVal,m_errorVal); }; - void set(ivec2 pos, ivec2 val) - { + void set(ivec2 _pos, ivec2 _val) { //if( pos.x>0 && pos.x0 && pos.y m_data; - agg::rendering_buffer * m_renderingBuffer; - agg::pixfmt_rgba32 * m_pixFrame; - rendererBase_t * m_renderBase; - rendererSolid_t * m_renderArea; + ivec2 m_size; + etk::Vector m_data; + agg::rendering_buffer * m_renderingBuffer; + agg::pixfmt_rgba32 * m_pixFrame; + rendererBase_t * m_renderBase; + rendererSolid_t * m_renderArea; agg::rasterizer_scanline_aa<> m_rasterizer; //!< AGG renderer system - agg::scanline_p8 m_scanLine; //!< + agg::scanline_p8 m_scanLine; //!< // curent color for the system ... - agg::rgba8 m_fillColor; - agg::rgba8 m_strokeColor; - float m_strokeSize; + agg::rgba8 m_fillColor; + agg::rgba8 m_strokeColor; + float m_strokeSize; public: // constructor : Image(ivec2 size); @@ -209,7 +193,7 @@ namespace draw // destructor ~Image(void); // initialiser - void Init(void); + void init(void); // EWOL internal API for Texture system : public: @@ -219,19 +203,16 @@ namespace draw // -- basic tools : // ----------------------------------------------- public : - void Resize(ivec2 size); + void resize(ivec2 size); //void Resize(etk::Vector2D startPos, Vector2D size); - ivec2 getSize(void) const - { + ivec2 getSize(void) const { return m_size; }; - int32_t getWidth(void) const - { + int32_t getWidth(void) const { return m_size.x(); }; - int32_t getHeight(void) const - { + int32_t getHeight(void) const { return m_size.y(); }; @@ -242,8 +223,7 @@ namespace draw //void Zoom(float coefficient); - void clear(void) - { + void clear(void) { for (int32_t iii=0; iii0 && pos.x()0 && pos.y()=0 && pos.x()=0 && pos.y()