godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Canvas: use Tuple instead of Colour for put Pixel, add two constructor that may be usefull in the future.

Browse Source
This commit is contained in:
Godzil
2020-02-20 16:07:39 +00:00
parent bc047cd89e
commit ba1ae34855
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/canvas.cpp
View File

@@ -22,6 +22,24 @@ Canvas::Canvas(uint32_t width, uint32_t height) : width(width), height(height)
this->stride = BytePP * width;
}
Canvas::Canvas(const Canvas &b)
{
this->width = b.width;
this->height = b.height;
this->stride = b.stride;
this->bitmap = (uint8_t *)calloc(4, b.width * b.height);
memcpy(this->bitmap, b.bitmap, 4 * b.width * b.height);
}
Canvas::Canvas(const Canvas *b)
{
this->width = b->width;
this->height = b->height;
this->stride = b->stride;
this->bitmap = (uint8_t *)calloc(4, b->width * b->height);
memcpy(this->bitmap, b->bitmap, 4 * b->width * b->height);
}
Canvas::~Canvas()
{
if (this->bitmap != nullptr)
@@ -30,18 +48,18 @@ Canvas::~Canvas()
}
}
void Canvas::putPixel(uint32_t x, uint32_t y, Colour c)
void Canvas::putPixel(uint32_t x, uint32_t y, Tuple colour)
{
uint32_t offset = y * this->stride + x * BytePP;
this->bitmap[offset + 0] = MAX(MIN(c.red() * 255, 255), 0);
this->bitmap[offset + 1] = MAX(MIN(c.green() * 255, 255), 0);
this->bitmap[offset + 2] = MAX(MIN(c.blue() * 255, 255), 0);
this->bitmap[offset + 0] = MAX(MIN(colour.x * 255, 255), 0);
this->bitmap[offset + 1] = MAX(MIN(colour.y * 255, 255), 0);
this->bitmap[offset + 2] = MAX(MIN(colour.z * 255, 255), 0);
}
Colour Canvas::getPixel(uint32_t x, uint32_t y)
{
uint32_t offset = y * this->stride + x * BytePP;
return Colour(this->bitmap[offset + 0] / 255, this->bitmap[offset + 1] / 255, this->bitmap[offset + 2] / 255);
return Colour(this->bitmap[offset + 0] / 255.0, this->bitmap[offset + 1] / 255.0, this->bitmap[offset + 2] / 255.0);
}
bool Canvas::SaveAsPNG(const char *filename)
@@ -49,4 +67,4 @@ bool Canvas::SaveAsPNG(const char *filename)
uint32_t ret = lodepng_encode24_file(filename, this->bitmap, this->width, this->height);
return ret == 0;
}
}

4
source/include/canvas.h
View File

@@ -21,9 +21,11 @@ public:
uint32_t width, height;
Canvas(uint32_t width, uint32_t height);
Canvas(const Canvas *c);
Canvas(const Canvas &c);
~Canvas();
void putPixel(uint32_t x, uint32_t y, Colour c);
void putPixel(uint32_t x, uint32_t y, Tuple c);
Colour getPixel(uint32_t x, uint32_t y);
bool SaveAsPNG(const char *filename);