From 8968379940957802c48784aa3dabb3666110db72 Mon Sep 17 00:00:00 2001 From: milang Date: Thu, 29 Aug 2019 19:01:51 +0200 Subject: [PATCH] mini changes --- include/render/translate.h | 2 +- include/render/zbuffer.h | 2 +- src/event/keyboard.c | 2 +- src/render/bitmap.c | 2 ++ src/render/zbuffer.c | 6 +++--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/render/translate.h b/include/render/translate.h index bef0e4d..f78359f 100644 --- a/include/render/translate.h +++ b/include/render/translate.h @@ -58,4 +58,4 @@ double cos(double angle); double sin(const double angle); -#endif \ No newline at end of file +#endif diff --git a/include/render/zbuffer.h b/include/render/zbuffer.h index d637339..869ad81 100644 --- a/include/render/zbuffer.h +++ b/include/render/zbuffer.h @@ -18,4 +18,4 @@ void render_zbuffer_clear(); **/ bool render_zbuffer_set_px(uint32_t x, uint32_t y, uint32_t dist); // if you are allowed to draw the pixel on vram -#endif \ No newline at end of file +#endif diff --git a/src/event/keyboard.c b/src/event/keyboard.c index b375d12..a9b773d 100644 --- a/src/event/keyboard.c +++ b/src/event/keyboard.c @@ -30,4 +30,4 @@ void FE_keyboard_reload() void FE_keyboard_set_key(uint32_t matrix_code, uint32_t ev_type, callback function) { callbacks[ev_type-1][get_x(matrix_code)][get_y(matrix_code)]=function; -} \ No newline at end of file +} diff --git a/src/render/bitmap.c b/src/render/bitmap.c index 8b67625..15679c5 100644 --- a/src/render/bitmap.c +++ b/src/render/bitmap.c @@ -46,6 +46,7 @@ bitmap_rich* bitmap_new_rich(uint32_t size_px_x, uint32_t size_px_y, uint32_t* c } else bmp->layout = layout; + return bmp; } @@ -71,6 +72,7 @@ inline uint8_t bitmap_get_pixel_r(const bitmap_rich * bmp, uint32_t x, uint32_t const uint32_t indice = y * bmp->size_o_y + (x >> 5); const uint32_t numero_bit = 31 - x % 32; + if (bmp->layout) return (( bmp->layout[indice] | 1 << numero_bit ) << 1) + ( bmp->color[indice] | (1 << numero_bit) ); else diff --git a/src/render/zbuffer.c b/src/render/zbuffer.c index 4b9e4eb..9b7f7b5 100644 --- a/src/render/zbuffer.c +++ b/src/render/zbuffer.c @@ -38,12 +38,12 @@ void render_zbuffer_clear() bool render_zbuffer_set_px(uint32_t x, uint32_t y, uint32_t dist) { const int indice = x * render_height + y; - + if (zbuffer[indice]>dist && dist>=render_min_dist && dist<=render_max_dist) { zbuffer[indice] = dist; return true; } - + return false; -} \ No newline at end of file +}