Name consistency

This commit is contained in:
Godzil
2020-02-20 14:48:11 +00:00
parent 14c3044acf
commit 863bb2a34b
9 changed files with 28 additions and 28 deletions

View File

@@ -30,7 +30,7 @@ Canvas::~Canvas()
}
}
void Canvas::put_pixel(uint32_t x, uint32_t y, Colour c)
void Canvas::putPixel(uint32_t x, uint32_t y, Colour c)
{
uint32_t offset = y * this->stride + x * BytePP;
this->bitmap[offset + 0] = MAX(MIN(c.red() * 255, 255), 0);
@@ -38,7 +38,7 @@ void Canvas::put_pixel(uint32_t x, uint32_t y, Colour c)
this->bitmap[offset + 2] = MAX(MIN(c.blue() * 255, 255), 0);
}
Colour Canvas::get_pixel(uint32_t x, uint32_t y)
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);

View File

@@ -23,8 +23,8 @@ public:
Canvas(uint32_t width, uint32_t height);
~Canvas();
void put_pixel(uint32_t x, uint32_t y, Colour c);
Colour get_pixel(uint32_t x, uint32_t y);
void putPixel(uint32_t x, uint32_t y, Colour c);
Colour getPixel(uint32_t x, uint32_t y);
bool SaveAsPNG(const char *filename);
};

View File

@@ -15,9 +15,9 @@ Matrix translation(double x, double y, double z);
Matrix scaling(double x, double y, double z);
Matrix rotation_x(double angle);
Matrix rotation_y(double angle);
Matrix rotation_z(double angle);
Matrix rotationX(double angle);
Matrix rotationY(double angle);
Matrix rotationZ(double angle);
Matrix shearing(double Xy, double Xx, double Yx, double Yz, double Zx, double Zy);

View File

@@ -33,7 +33,7 @@ Matrix scaling(double x, double y, double z)
return ret;
}
Matrix rotation_x(double angle)
Matrix rotationX(double angle)
{
Matrix ret = Matrix4().identity();
@@ -45,7 +45,7 @@ Matrix rotation_x(double angle)
return ret;
}
Matrix rotation_y(double angle)
Matrix rotationY(double angle)
{
Matrix ret = Matrix4().identity();
@@ -57,7 +57,7 @@ Matrix rotation_y(double angle)
return ret;
}
Matrix rotation_z(double angle)
Matrix rotationZ(double angle)
{
Matrix ret = Matrix4().identity();