diff options
Diffstat (limited to 'src/renderer/RSoftwareBackend.cpp')
| -rw-r--r-- | src/renderer/RSoftwareBackend.cpp | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/src/renderer/RSoftwareBackend.cpp b/src/renderer/RSoftwareBackend.cpp index f0e2e5f..217354b 100644 --- a/src/renderer/RSoftwareBackend.cpp +++ b/src/renderer/RSoftwareBackend.cpp @@ -1,3 +1,4 @@ +#include "renderer/Renderer.hpp" #include <renderer/RSoftwareBackend.hpp> #include <SDL3/SDL_video.h> @@ -55,8 +56,7 @@ RSoftwareBackend::Draw() REntity_Rectangle clear_rect = { REntityType_Rectangle, - 0, 0, - (float)(m_canvas.w-1), (float)(m_canvas.h-1), + {0, 0, (float)(m_canvas.w-1), (float)(m_canvas.h-1)}, 0.0f, m_renderer.m_clear_color }; @@ -71,16 +71,15 @@ RSoftwareBackend::Draw() REntity& entity = m_renderer.m_render_entities[sort_entry.entity_index]; switch (entity.type) { - case REntityType_Rectangle: { - DrawRectangle(entity.rect); - } break; + case REntityType_Rectangle: { + DrawRectangle(entity.rect); + } break; - case REntityType_MonoBitmap: { - Color color = {0.0f, 0.0f, 0.0f, 1.0f}; - DrawMonoBitmap(entity.bitmap, color); - } break; + case REntityType_MonoBitmap: { + DrawMonoBitmap(entity.bitmap); + } break; - default:; + default:; } } @@ -110,12 +109,12 @@ RSoftwareBackend::SortRenderEntities() } void -RSoftwareBackend::DrawRectangle(REntity_Rectangle& rect) +RSoftwareBackend::DrawRectangle(REntity_Rectangle& entity) { - int32_t xmin = m_renderer.WorldXToScreenX(rect.x0); - int32_t ymin = m_renderer.WorldYToScreenY(rect.y0); - int32_t xmax = m_renderer.WorldXToScreenX(rect.x1); - int32_t ymax = m_renderer.WorldYToScreenY(rect.y1); + int32_t xmin = m_renderer.WorldXToScreenX(entity.rect.x0); + int32_t ymin = m_renderer.WorldYToScreenY(entity.rect.y0); + int32_t xmax = m_renderer.WorldXToScreenX(entity.rect.x1); + int32_t ymax = m_renderer.WorldYToScreenY(entity.rect.y1); if (xmin < 0) { xmin = 0; @@ -136,9 +135,9 @@ RSoftwareBackend::DrawRectangle(REntity_Rectangle& rect) for (int32_t y = ymin; y <= ymax; ++y) { uint32_t *pixel = m_canvas.pixels + y * m_canvas.w + xmin; for (int32_t x = xmin; x <= xmax; ++x) { - uint32_t r = (uint32_t)(rect.color.r * 255.0f); - uint32_t g = (uint32_t)(rect.color.g * 255.0f); - uint32_t b = (uint32_t)(rect.color.b * 255.0f); + uint32_t r = (uint32_t)(entity.color.r * 255.0f); + uint32_t g = (uint32_t)(entity.color.g * 255.0f); + uint32_t b = (uint32_t)(entity.color.b * 255.0f); uint32_t val = r << rshift | g << gshift | b << bshift; *pixel++ = val; } @@ -147,12 +146,12 @@ RSoftwareBackend::DrawRectangle(REntity_Rectangle& rect) void -RSoftwareBackend::DrawMonoBitmap(REntity_MonoBitmap& mono_bitmap, Color color) +RSoftwareBackend::DrawMonoBitmap(REntity_MonoBitmap& entity) { - int32_t x0 = (int32_t)mono_bitmap.x; - int32_t y0 = (int32_t)mono_bitmap.y; - int32_t x1 = (int32_t)mono_bitmap.x + mono_bitmap.w - 1; - int32_t y1 = (int32_t)mono_bitmap.y + mono_bitmap.h - 1; + int32_t x0 = (int32_t)entity.pos.x; + int32_t y0 = (int32_t)entity.pos.y; + int32_t x1 = (int32_t)entity.pos.x + entity.bitmap.w - 1; + int32_t y1 = (int32_t)entity.pos.y + entity.bitmap.h - 1; int32_t cut_left = 0; int32_t cut_bot = 0; @@ -177,7 +176,7 @@ RSoftwareBackend::DrawMonoBitmap(REntity_MonoBitmap& mono_bitmap, Color color) uint32_t gshift = m_canvas.gshift; uint32_t bshift = m_canvas.bshift; - uint8_t* grayscale = (uint8_t*)mono_bitmap.data + (-cut_bot * mono_bitmap.w) + (-cut_left); + uint8_t* grayscale = (uint8_t*)entity.bitmap.pixels.get() + (-cut_bot * entity.bitmap.w) + (-cut_left); uint32_t* rgba = m_canvas.pixels + y0 * m_canvas.w + x0; for (int32_t y = y0; y <= y1; y++) { uint8_t *grayscale_pixels = grayscale; @@ -192,9 +191,9 @@ RSoftwareBackend::DrawMonoBitmap(REntity_MonoBitmap& mono_bitmap, Color color) float g0 = (rgba_result >> gshift) & 0xff; float b0 = (rgba_result >> bshift) & 0xff; - float r1 = r0 + (color.r - r0)*alpha; - float g1 = g0 + (color.g - g0)*alpha; - float b1 = b0 + (color.b - b0)*alpha; + float r1 = r0 + (entity.color.r - r0)*alpha; + float g1 = g0 + (entity.color.g - g0)*alpha; + float b1 = b0 + (entity.color.b - b0)*alpha; rgba_result = (uint32_t)r1 << rshift | (uint32_t)g1 << gshift | (uint32_t)b1 << bshift; *rgba_pixels = rgba_result; @@ -203,7 +202,7 @@ RSoftwareBackend::DrawMonoBitmap(REntity_MonoBitmap& mono_bitmap, Color color) rgba_pixels++; } - grayscale += mono_bitmap.w; + grayscale += entity.bitmap.w; rgba += m_canvas.w; } } |