From 0d10b77f77459333c5549711334f417623ab1f3e Mon Sep 17 00:00:00 2001 From: vimene Date: Sat, 17 Jan 2026 00:06:31 +0100 Subject: improved software shaders - unified terminal and graphical software renderer shaders - added vertex shaders for software renderers - removed VertexData - moved shaders from frame buffers to their own class - added FrameBufferConcept and ShadersConcept --- src/fb/pixfb.cpp | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) (limited to 'src/fb/pixfb.cpp') diff --git a/src/fb/pixfb.cpp b/src/fb/pixfb.cpp index c629adb..c86859b 100644 --- a/src/fb/pixfb.cpp +++ b/src/fb/pixfb.cpp @@ -2,16 +2,9 @@ #include #include #include "math/vector.hpp" -#include "math/quat.hpp" -#include "o3d/vertex_data.hpp" -#include "o3d/camera.hpp" using namespace engine::fb; -using - engine::math::Vector2, - engine::math::Vector3, - engine::o3d::VertexData, - engine::o3d::Camera; +using engine::math::Vector4; PixelFrameBuffer::PixelFrameBuffer(unsigned int w, unsigned int h) { resize(w, h); @@ -28,26 +21,10 @@ void PixelFrameBuffer::clear() { std::fill(pixels_vector.begin(), pixels_vector.end(), 0xff000000); } -extern Camera* camera; - -void PixelFrameBuffer::draw_point(int x, int y, const Vector3& /* loc */, const Vector3& normal, const Vector2& /* uv */, const VertexData& vd) { - auto u = vd.world_loc - camera->transform.loc; - float u_len_sq = u.length_squared(); - u = u.normalize(); - float attenuation = camera->transform.rot.rot({ 0.f, 0.f, -1.f }).dot(u); - if (attenuation < .7f) attenuation = 0.f; - else if (attenuation > .8f) attenuation = 1.f; - else attenuation = (attenuation - .7f) / .1f; - float light = -normal.normalize().dot(u) / u_len_sq; - if (light < 0.f) light = 0.f; - float final_light = .003f + light * attenuation * .8f * .997f; - if (final_light > 1.f) final_light = 1.f; - // gamma correction - // TODO: improve, we shouldn't do it here - if (final_light <= .0031308f) - final_light = final_light * 12.92f; - else - final_light = 1.055f * pow(final_light, 1.f / 2.4f) - .055f; - std::uint32_t c = (int) (final_light * 255.f); - pixels_vector[x + y * w] = 0xff000000 | c << 16 | c << 8 | c; +void PixelFrameBuffer::draw_point(int x, int y, const Vector4& point) { + pixels_vector[x + y * w] = + std::clamp(static_cast(point.w * 256), static_cast(0), static_cast(255)) << (3 * 8) + | std::clamp(static_cast(point.x * 256), static_cast(0), static_cast(255)) << (2 * 8) + | std::clamp(static_cast(point.y * 256), static_cast(0), static_cast(255)) << (1 * 8) + | std::clamp(static_cast(point.z * 256), static_cast(0), static_cast(255)) << (0 * 8); } -- cgit v1.2.3