TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-08-04 01:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not draw outside of the buffer

Browse Source
This commit is contained in:
Baptiste Wicht 2016-09-24 20:08:50 +02:00
parent 4e5bcaf42e
commit 5af4bc0bd1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/odin/src/main.cpp
View File

@ -46,13 +46,15 @@ void fill_buffer(uint32_t color) {
} }
void draw_pixel(size_t x, size_t y, uint32_t color) { void draw_pixel(size_t x, size_t y, uint32_t color) {
if(x < width && y < height){
z_buffer[x + y * y_shift] = color; z_buffer[x + y * y_shift] = color;
} }
}
void draw_hline(size_t x, size_t y, size_t w, uint32_t color) { void draw_hline(size_t x, size_t y, size_t w, uint32_t color) {
auto where = x + y * y_shift; auto where = x + y * y_shift;
for (size_t i = 0; i < w; ++i) { for (size_t i = 0; i < w && x + i < width; ++i) {
z_buffer[where + i] = color; z_buffer[where + i] = color;
} }
} }
@ -60,7 +62,7 @@ void draw_hline(size_t x, size_t y, size_t w, uint32_t color) {
void draw_vline(size_t x, size_t y, size_t h, uint32_t color) { void draw_vline(size_t x, size_t y, size_t h, uint32_t color) {
auto where = x + y * y_shift; auto where = x + y * y_shift;
for (size_t j = 0; j < h; ++j) { for (size_t j = 0; j < h && y + j < height; ++j) {
z_buffer[where] = color; z_buffer[where] = color;
where += y_shift; where += y_shift;
} }
@ -69,8 +71,8 @@ void draw_vline(size_t x, size_t y, size_t h, uint32_t color) {
void draw_rect(size_t x, size_t y, size_t w, size_t h, uint32_t color) { void draw_rect(size_t x, size_t y, size_t w, size_t h, uint32_t color) {
auto where = x + y * y_shift; auto where = x + y * y_shift;
for (size_t j = 0; j < h; ++j) { for (size_t j = 0; j < h && y + j < height; ++j) {
for (size_t i = 0; i < w; ++i) { for (size_t i = 0; i < w && x + i < width; ++i) {
z_buffer[where + i] = color; z_buffer[where + i] = color;
} }