Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-07 00:25:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowed declaration.

Browse Source
This commit is contained in:
Relintai 2022-04-17 03:20:34 +02:00
parent 62c384b3a4
commit 28f57aa439
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/paint/paint_canvas.cpp
View File

@ -424,12 +424,12 @@ void PaintCanvas::hide_grid() {
grid->hide(); grid->hide();
} }
PoolVector2iArray PaintCanvas::select_color(const int x, const int y) { PoolVector2iArray PaintCanvas::select_color(const int p_x, const int p_y) {
PoolVector2iArray same_color_pixels; PoolVector2iArray same_color_pixels;
Color color = get_pixel(x, y); Color color = get_pixel(p_x, p_y);
for (int x = 0; x < active_layer->layer_width; ++x) { for (int x = 0; x < active_layer->layer_width; ++x) {
for (int x = 0; x < active_layer->layer_height; ++x) { for (int y = 0; y < active_layer->layer_height; ++y) {
Color pixel_color = active_layer->get_pixel(x, y); Color pixel_color = active_layer->get_pixel(x, y);
if (pixel_color == color) { if (pixel_color == color) {
same_color_pixels.append(Vector2i(x, y)); same_color_pixels.append(Vector2i(x, y));
@ -439,8 +439,8 @@ PoolVector2iArray PaintCanvas::select_color(const int x, const int y) {
return same_color_pixels; return same_color_pixels;
} }
PoolVector2iArray PaintCanvas::select_same_color(const int x, const int y) { PoolVector2iArray PaintCanvas::select_same_color(const int p_x, const int p_y) {
return get_neighbouring_pixels(x, y); return get_neighbouring_pixels(p_x, p_y);
} }
// returns array of Vector2 // returns array of Vector2

4
modules/paint/paint_canvas.h
View File

@ -103,8 +103,8 @@ public:
void show_grid(); void show_grid();
void hide_grid(); void hide_grid();
PoolVector2iArray select_color(const int x, const int y); PoolVector2iArray select_color(const int p_x, const int p_y);
PoolVector2iArray select_same_color(const int x, const int y); PoolVector2iArray select_same_color(const int p_x, const int p_y);
PoolVector2iArray get_neighbouring_pixels(const int pos_x, const int pos_y); PoolVector2iArray get_neighbouring_pixels(const int pos_x, const int pos_y);
void resize(int width, int height); void resize(int width, int height);