[STYLE] remove (void) in () to be c++ coherent
This commit is contained in:
parent
31442b4615
commit
04556d63d1
@ -39,7 +39,7 @@ namespace draw {
|
|||||||
public :
|
public :
|
||||||
float r,g,b,a;
|
float r,g,b,a;
|
||||||
|
|
||||||
Colorf(void) :
|
Colorf() :
|
||||||
r(0.0),
|
r(0.0),
|
||||||
g(0.0),
|
g(0.0),
|
||||||
b(0.0),
|
b(0.0),
|
||||||
@ -61,7 +61,7 @@ namespace draw {
|
|||||||
b = (float)_input.b / 255.0;
|
b = (float)_input.b / 255.0;
|
||||||
a = (float)_input.a / 255.0;
|
a = (float)_input.a / 255.0;
|
||||||
}
|
}
|
||||||
~Colorf(void)
|
~Colorf()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include <draw/Image.h>
|
#include <draw/Image.h>
|
||||||
|
|
||||||
|
|
||||||
draw::Image::Image(void) :
|
draw::Image::Image() :
|
||||||
m_renderingBuffer(NULL),
|
m_renderingBuffer(NULL),
|
||||||
m_pixFrame(NULL),
|
m_pixFrame(NULL),
|
||||||
m_renderBase(NULL),
|
m_renderBase(NULL),
|
||||||
@ -52,7 +52,7 @@ draw::Image::Image(ivec2 _size) :
|
|||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void draw::Image::init(void)
|
void draw::Image::init()
|
||||||
{
|
{
|
||||||
// basic element :
|
// basic element :
|
||||||
draw::Color tmpBg(0,0,0,0);
|
draw::Color tmpBg(0,0,0,0);
|
||||||
@ -100,7 +100,7 @@ void draw::Image::init(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
draw::Image::~Image(void)
|
draw::Image::~Image()
|
||||||
{
|
{
|
||||||
if (NULL != m_renderArea) {
|
if (NULL != m_renderArea) {
|
||||||
delete(m_renderArea);
|
delete(m_renderArea);
|
||||||
@ -186,12 +186,12 @@ void draw::Image::resize(ivec2 size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void draw::Image::begin(void)
|
void draw::Image::begin()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void draw::Image::end(void)
|
void draw::Image::end()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -216,12 +216,12 @@ 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()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
// generate the display
|
// generate the display
|
||||||
void draw::Image::draw(void)
|
void draw::Image::draw()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -310,7 +310,7 @@ 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()
|
||||||
{
|
{
|
||||||
distanceField(ivec2(0,0), m_size);
|
distanceField(ivec2(0,0), m_size);
|
||||||
}
|
}
|
||||||
|
32
draw/Image.h
32
draw/Image.h
@ -62,7 +62,7 @@ class Grid
|
|||||||
// preallocate data with a basic bg elements :
|
// preallocate data with a basic bg elements :
|
||||||
m_data.resize(m_size.x()*m_size.y(), tmpPoint);
|
m_data.resize(m_size.x()*m_size.y(), tmpPoint);
|
||||||
};
|
};
|
||||||
~Grid(void) { };
|
~Grid() { };
|
||||||
void setOutsideVal(int32_t _newVal) {
|
void setOutsideVal(int32_t _newVal) {
|
||||||
m_outsideVal = _newVal;
|
m_outsideVal = _newVal;
|
||||||
}
|
}
|
||||||
@ -115,7 +115,7 @@ class Grid {
|
|||||||
// preallocate data with a basic bg elements :
|
// preallocate data with a basic bg elements :
|
||||||
m_data.resize(m_size.x()*m_size.y(), tmpPoint);
|
m_data.resize(m_size.x()*m_size.y(), tmpPoint);
|
||||||
};
|
};
|
||||||
~Grid(void) { };
|
~Grid() { };
|
||||||
void setOutsideVal(int32_t _newVal) {
|
void setOutsideVal(int32_t _newVal) {
|
||||||
m_outsideVal = _newVal;
|
m_outsideVal = _newVal;
|
||||||
}
|
}
|
||||||
@ -160,7 +160,7 @@ class Grid {
|
|||||||
_p = other;
|
_p = other;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
void generateSDF(void);
|
void generateSDF();
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -189,15 +189,15 @@ namespace draw
|
|||||||
public:
|
public:
|
||||||
// constructor :
|
// constructor :
|
||||||
Image(ivec2 size);
|
Image(ivec2 size);
|
||||||
Image(void);
|
Image();
|
||||||
// destructor
|
// destructor
|
||||||
~Image(void);
|
~Image();
|
||||||
// initialiser
|
// initialiser
|
||||||
void init(void);
|
void init();
|
||||||
|
|
||||||
// EWOL internal API for Texture system :
|
// EWOL internal API for Texture system :
|
||||||
public:
|
public:
|
||||||
void* getTextureDataPointer(void) { return &m_data[0]; };
|
void* getTextureDataPointer() { return &m_data[0]; };
|
||||||
|
|
||||||
// -----------------------------------------------
|
// -----------------------------------------------
|
||||||
// -- basic tools :
|
// -- basic tools :
|
||||||
@ -206,13 +206,13 @@ namespace draw
|
|||||||
void resize(ivec2 size);
|
void resize(ivec2 size);
|
||||||
//void Resize(std::vector2D<int32_t> startPos, Vector2D<int32_t> size);
|
//void Resize(std::vector2D<int32_t> startPos, Vector2D<int32_t> size);
|
||||||
|
|
||||||
ivec2 getSize(void) const {
|
ivec2 getSize() const {
|
||||||
return m_size;
|
return m_size;
|
||||||
};
|
};
|
||||||
int32_t getWidth(void) const {
|
int32_t getWidth() const {
|
||||||
return m_size.x();
|
return m_size.x();
|
||||||
};
|
};
|
||||||
int32_t getHeight(void) const {
|
int32_t getHeight() const {
|
||||||
return m_size.y();
|
return m_size.y();
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -223,7 +223,7 @@ namespace draw
|
|||||||
//void Zoom(float coefficient);
|
//void Zoom(float coefficient);
|
||||||
|
|
||||||
|
|
||||||
void clear(void) {
|
void clear() {
|
||||||
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;
|
||||||
}
|
}
|
||||||
@ -257,8 +257,8 @@ namespace draw
|
|||||||
// -- drawing tools :
|
// -- drawing tools :
|
||||||
// -----------------------------------------------
|
// -----------------------------------------------
|
||||||
public :
|
public :
|
||||||
void begin(void);
|
void begin();
|
||||||
void end(void);
|
void end();
|
||||||
void setFillColor(draw::Color newColor) {
|
void setFillColor(draw::Color newColor) {
|
||||||
m_fillColor = newColor;
|
m_fillColor = newColor;
|
||||||
}
|
}
|
||||||
@ -272,8 +272,8 @@ namespace draw
|
|||||||
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 draw(void);
|
void draw();
|
||||||
|
|
||||||
void line(vec2 posStart, vec2 posEnd);
|
void line(vec2 posStart, vec2 posEnd);
|
||||||
void dot(vec2 pos);
|
void dot(vec2 pos);
|
||||||
@ -281,7 +281,7 @@ namespace draw
|
|||||||
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 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) {};
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#include <draw/debug.h>
|
#include <draw/debug.h>
|
||||||
|
|
||||||
int32_t draw::getLogId(void) {
|
int32_t draw::getLogId() {
|
||||||
static int32_t g_val = etk::log::registerInstance("draw");
|
static int32_t g_val = etk::log::registerInstance("draw");
|
||||||
return g_val;
|
return g_val;
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <etk/log.h>
|
#include <etk/log.h>
|
||||||
|
|
||||||
namespace draw {
|
namespace draw {
|
||||||
int32_t getLogId(void);
|
int32_t getLogId();
|
||||||
};
|
};
|
||||||
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
||||||
#define DRAW_BASE(info,data) \
|
#define DRAW_BASE(info,data) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user