DarkStore-3DS/Universal-Core
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Universal-Core.git synced 2026-07-03 00:39:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Sprite::drawOutline

Browse Source
This commit is contained in:
Pk11
2021-01-14 13:45:07 -06:00
parent 38b1780d1e
commit 4442c37f45
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sprite.hpp
+10
View File
@@ -120,6 +120,16 @@ public:
*/
void fillColor(u16 color);
/**
* @brief Draws a rectangle outline to the sprite
* @param x The X position
* @param y The Y position
* @param w The Width
* @param h The Height
* @param color The color to use
*/
void drawOutline(int x, int y, int w, int h, u16 color);
/**
* @brief Draws a solid color rectangle to the sprite
* @param x The X position to draw at
source/graphics.cpp
+4 -4
View File
@@ -71,15 +71,15 @@ void Graphics::drawOutline(int x, int y, int w, int h, u8 color, bool top, int l
u8 *dst = (u8 *)bgGetGfxPtr(top ? layer : layer + 4);
h += y;
if(y >= 0 && y < 192)
toncset(dst + ((y * 256) + (x < 0 ? 0 : x)), color, (x + w > 256 ? w + (256 - x - w) : w));
toncset(dst + y * 256 + std::max(x, 0), color, std::min(w, 256 - x - w));
for(y++; y < (h - 1); y++) {
if(y >= 0 && y < 192 && x > 0)
toncset(dst + ((y)*256 + x), color, 1);
toncset(dst + y * 256 + x, color, 1);
if(y >= 0 && y < 192 && x + w < 256)
toncset(dst + ((y)*256 + x + w - 1), color, 1);
toncset(dst + y * 256 + x + w - 1, color, 1);
}
if(y >= 0 && y < 192)
toncset(dst + ((y * 256) + (x < 0 ? 0 : x)), color, (x + w > 256 ? w + (256 - x - w) : w));
toncset(dst + y * 256 + std::max(x, 0), color, std::min(w, 256 - x - w));
}
void Graphics::drawRectangle(int x, int y, int w, int h, u8 color, bool top, bool layer) {
source/sprite.cpp
+19 -5
View File
@@ -169,9 +169,23 @@ void Sprite::clear(void) { toncset16(_gfx, 0, (_size & 0xFF) << 5); }
void Sprite::fillColor(u16 color) { toncset16(_gfx, color, (_size & 0xFF) << 5); }
void Sprite::drawOutline(int x, int y, int w, int h, u16 color) {
h += y;
if(y >= 0 && y < _height)
toncset16(_gfx + y * _width + std::max(x, 0), color, std::min(w, _width - x - w));
for(y++; y < (h - 1); y++) {
if(y >= 0 && y < _height && x > 0)
_gfx[y * _width + x] = color;
if(y >= 0 && y < _height && x + w < _width)
_gfx[y * _width + x + w - 1] = color;
}
if(y >= 0 && y < _height)
toncset16(_gfx + y * _width + std::max(x, 0), color, std::min(w, _width - x - w));
}
void Sprite::drawRectangle(int x, int y, int w, int h, u16 color1, u16 color2) {
for(int i = 0; i < h; i++) {
toncset(_gfx + ((y + i) * _width + x), ((i % 2) ? color1 : color2), w);
toncset16(_gfx + ((y + i) * _width + x), ((i % 2) ? color1 : color2), w);
}
}
@@ -182,7 +196,7 @@ void Sprite::drawImage(int x, int y, const Image &image, float scaleX, float sca
for(int j = 0; j < image.width(); j++) {
u16 px = image.palette()[image.bitmap()[i * image.width() + j] - image.palOfs()];
if(px & 0x8000)
toncset16(_gfx + (y + i) * _height + x + j, px, 1);
_gfx[(y + i) * _height + x + j] = px;
}
}
} else {
@@ -191,7 +205,7 @@ void Sprite::drawImage(int x, int y, const Image &image, float scaleX, float sca
u16 px =
image.palette()[image.bitmap()[int(i / scaleY) * image.width() + int(j / scaleX)] - image.palOfs()];
if(px & 0x8000)
toncset16(_gfx + (y + i) * _height + j + x, px, 1);
_gfx[(y + i) * _height + j + x] = px;
}
}
}
@@ -205,7 +219,7 @@ void Sprite::drawImageSegment(int x, int y, int imageX, int imageY, int w, int h
for(int j = 0; j < w; j++) {
u16 px = image.palette()[image.bitmap()[(imageY + i) * image.width() + imageX + j] - image.palOfs()];
if(px & 0x8000)
toncset16(_gfx + ((y + i) * _height + x + j), px, 1);
_gfx[(y + i) * _height + x + j] = px;
}
}
} else {
@@ -215,7 +229,7 @@ void Sprite::drawImageSegment(int x, int y, int imageX, int imageY, int w, int h
int(j / scaleX)] -
image.palOfs()];
if(px & 0x8000)
toncset16(_gfx + (y + i) * _height + x + j, px, 1);
_gfx[(y + i) * _height + x + j] = px;
}
}
}