From 3588a416574e56999b0910329e3ee3ec01dc4d22 Mon Sep 17 00:00:00 2001 From: Annika Date: Mon, 20 Jul 2026 02:04:17 -0700 Subject: [PATCH] CRTP shaders on Lines --- example | Bin 37000 -> 37056 bytes example.cpp | 30 +++++----- primatives/line.cpp | 121 ++++++++------------------------------- primatives/trapezoid.cpp | 50 ++-------------- 4 files changed, 46 insertions(+), 155 deletions(-) diff --git a/example b/example index 6abee0c9414797f0a454ce0dfe4daee5adfc93f7..8c8a99471886abd53d63a2ab34b6a0c759737d72 100755 GIT binary patch delta 7230 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 delta 5231 zcmZWt4^&iD8o%>k02O9{Pyqu691%~6Gb(}tIu8eY7!@U;=AUp?a>a^Obp1n)E?~R{ zl)Tni+fJ#qyS3ZdRj0D7qoa~8*(SN3w#;%c%78Bu1{4R zmlEyQ=zgS+gYMVTd(juTl%(p}YBLbS4Jsc_zu<;PrD`_&koIz~$L!7dxSP+(jW%!X z?hQ?Qv1MlKp)sC!f}Dd~k?Csh*kvk)sX)BiAT0rWS*EIx8o>J|tGq3M@5)g5%mBVs z)prp`fS^+AAO!GDnuDSMez(TY4d5#^zAS*>r}4`b-bF~?h&4fFKnI%^(B=TXNYk$m z;L9|AcL3j|@!o;F=V_B~lxs!=AwpwLX(Ay~&HrS%V}eRN%7|5rNCHuwW*%9qWYav7 z@N?`fLgUbvI6@BlumbqfBbFdQ313_?Td27jE8WJxggUReb{WKicw7)qN|Tvg@q!?J zBK;DsRC%y2qSCzBEE(0R=(L7Qy}HT?={vppiF6!Qr`YWjFC*lb1VY3UcCR$Kup4(8cZLvR9_b(j;unJWuY$2Hd`%mDb)wZ(XgFGEI96Wsvtdp1l^9r+ z50SMA@O{U+c9{8KwKZIng$jA}$=aN&NE4BXjIm4U>QJP+7-^k%O*rHBgRAqdmstG< z%Ro(Ytlc|*A-{lM$S>lbMDi|3=OH+PposK123u}uqK+ve9^)}R^3aMbLVEfq2$|WH z!@@W2U@*mBHB@jLAAu5Pq-v1tGmqR1L*%%I(EqKXpZ=R1`p%RQTtXIYnUe6pLXc$5 z#1f$<=gd@81@VWf2*I6`l8xaE^@5U?!2Jp1q#PPGb^5Hc@yu!Z83l4$8JP2~iN`QO z-M2A8?wr4&Cq@_6(e{fhtD_0MBg=XmHCHn+A;#JS`pVQX(G>|u{aB|pQrd#v?(|3F z>3^o~7;*^>tplyh*+1eG+IeCda+GKHibw5d4hJJv_`Gz7$%ghZB+~ zp5Tjl@ob48-W9~tvjy=Kc2Ah}0IadiLs`}v(+>W;zOAbM zNuw|OY5Vk1i8l};l4HLqxStDKK@j10SK7FZ@e(AxY-lJzgKzF36#~&gu5ByV~ils77Ach5P7r`g-25?B~ZRs%)>Z z%X$ToN|@7{W*f{G;07Lsru_{60Xrp>#OoO!cb#_U#mCxlpd3npP~mZN*kW)E47pB6 z<)^y3v9AwB4iIKXL3j!YVJFoaI8?73ZW7!PEldyBL!XgebduiC^uFna-pf$i%hZwv zsI_2Tq-v(-j;Le8xB62wE!!}u73hV)H2A;hr%U6NzK!WAo1B?O2 zd@swXKr1jCI0;w;bOM(Gi-GHaOMwj>agi!ic7u2q_!+PV*aNI;mt`APX**B=R{bc; zT|lcO%l9Kd=T%wW2P_6Q1D6870#*U90(SxlrpNjd0s=aL*}!5XV>xgsu-X`k4yZKI zZ;MC8t;3kvIwQ_dwxWm?KlUmpqj4o;T$#v30i&I!$hCt_VR=IciA8fAek&pST9rAt z(-87QNFmxg@hkgQmS01rNUkYzJ6B|i-4-;{WN8e}HKjHfd6R8x2ye=)33Zx^f)*JD zn=)sZY`iHo*JQ~x#iC2DVvHbDET(q+d~n9>vBEe%e&@j<9;Gmjy^+2G$5tyVjI*%m z3g|ltT%bJx9J2>d3hTST;7|v6le@C{6mKP3JY-r=eFv{V}NaBBV&;wMQRK35w#nCex&#M2~lwEsXQ?o@-B+ z26O&-bk?dgm#&VvRtlRaj)W8a&8V;0JdLl^%hThe9UjYBP#&>Bvd#|u^2|qS4JzuygP^^U9(gc-S;@NS*iUAR@ z4qX}amDOonStk8-bw1ZMg+^Cx<1FcPZ&liaB6j)=C~V8HKAQu0wpAJLokY1c`CMeW zXV#iW3NS3>ORe|z8zAuzFvpwDj36KWg_?}GJ;rEsqHWoNIo@G506_2 zX(YiF|2vJ=Uvrk=+tSJE46IE;LWCN*UYa%@uV-A@-cWf&IFT}@;D4{%{-SO5S3 diff --git a/example.cpp b/example.cpp index 625c540..0e4d4cd 100644 --- a/example.cpp +++ b/example.cpp @@ -45,6 +45,10 @@ int main(void) { UwU::ColorShader green = UwU::ColorShader(UwU::Color(0x00ff00ff)); UwU::Point point = UwU::Point(187, 37); point.draw(surface.buffer, green); + + UwU::ColorShader blue = UwU::ColorShader(UwU::Color(0x0000ffff)); + UwU::Trapezoid trapezoid = UwU::Trapezoid(100, 300, 690, 320, 720, 780); + trapezoid.draw(surface.buffer, blue); // // Benchmarking // struct timespec start, end; @@ -73,20 +77,20 @@ int main(void) { // printf("Elapsed: %ld ns\n", timeAvg); - // UwU::Line lines[8] { - // UwU::Line(300, 100, 250, 469), - // UwU::Line(250, 100, 300, 469), - // UwU::Line(300, 100, 469, 250), - // UwU::Line(469, 100, 300, 250), - // UwU::Line(100, 300, 250, 469), - // UwU::Line(250, 300, 100, 469), - // UwU::Line(100, 300, 469, 250), - // UwU::Line(469, 300, 100, 250) - // }; + UwU::Line lines[8] { + UwU::Line(300, 100, 250, 469), + UwU::Line(250, 100, 300, 469), + UwU::Line(300, 100, 469, 250), + UwU::Line(469, 100, 300, 250), + UwU::Line(100, 300, 250, 469), + UwU::Line(250, 300, 100, 469), + UwU::Line(100, 300, 469, 250), + UwU::Line(469, 300, 100, 250) + }; - // for (uint16_t i = 0; i < 8; i++) { - // lines[i].draw(surface.buffer, bisexual); - // } + for (uint16_t i = 0; i < 8; i++) { + lines[i].draw(surface.buffer, blue); + } surface.present(); diff --git a/primatives/line.cpp b/primatives/line.cpp index 42727c5..b9a7bc9 100644 --- a/primatives/line.cpp +++ b/primatives/line.cpp @@ -5,14 +5,15 @@ #include "../datatypes.cpp" #include "../helpers.cpp" #include "../buffer.cpp" -#include "../shader.cpp" +#include "../shaders/shaders.h" namespace UwU { // line class Line { private: // plot lines if m <= 1 - void lineLow(int16_t ix0, int16_t iy0, int16_t ix1, int16_t iy1, Buffer buffer, Shader shader) { + template + void lineLow(int16_t ix0, int16_t iy0, int16_t ix1, int16_t iy1, Buffer buffer, ShaderBase& shader) { int16_t dx = ix1 - ix0; int16_t dy = iy1 - iy0; int16_t yi = 1; @@ -23,59 +24,21 @@ namespace UwU { int16_t d = (2 * dy) - dx; int16_t y = iy0; - if (shader.shaderType == COLOR) { - for (int16_t x = ix0; x < ix1; x++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, shader.c0); - if (d > 0) { - y += yi; - d += (2 * (dy - dx)); - } else { - d += (2 * dy); - } + for (int16_t x = ix0; x < ix1; x++) { + buffer.drawPixel((uint16_t)x, (uint16_t)y, shader.shade(x, y)); + if (d > 0) { + y += yi; + d += (2 * (dy - dx)); + } else { + d += (2 * dy); } - return; - - } else if (shader.shaderType == HGRADIENT) { - for (int16_t x = ix0; x < ix1; x++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, ShaderMethods::gradient(shader.u0, shader.scale, shader.c0, shader.c1, x)); - if (d > 0) { - y += yi; - d += (2 * (dy - dx)); - } else { - d += (2 * dy); - } - } - return; - - } else if (shader.shaderType == VGRADIENT) { - for (int16_t x = ix0; x < ix1; x++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, ShaderMethods::gradient(shader.v0, shader.scale, shader.c0, shader.c1, y)); - if (d > 0) { - y += yi; - d += (2 * (dy - dx)); - } else { - d += (2 * dy); - } - } - return; - - } else if (shader.shaderType == BUFFER) { - for (int16_t x = ix0; x < ix1; x++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, ShaderMethods::buffer(shader.u0, shader.v0, shader.buffer, x, y)); - if (d > 0) { - y += yi; - d += (2 * (dy - dx)); - } else { - d += (2 * dy); - } - } - return; } return; } // plot lines if m >1 - void lineHigh(int16_t ix0, int16_t iy0, int16_t ix1, int16_t iy1, Buffer buffer, Shader shader) { + template + void lineHigh(int16_t ix0, int16_t iy0, int16_t ix1, int16_t iy1, Buffer buffer, ShaderBase& shader) { int16_t dx = ix1 - ix0; int16_t dy = iy1 - iy0; int16_t xi = 1; @@ -86,55 +49,16 @@ namespace UwU { int16_t d = (2 * dx) - dy; int16_t x = ix0; - if (shader.shaderType == COLOR) { - for (int16_t y = iy0; y < iy1; y++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, shader.c0); - if (d > 0) { - x += xi; - d += (2 * (dx - dy)); - } else { - d += (2 * dx); - } + for (int16_t y = iy0; y < iy1; y++) { + buffer.drawPixel((uint16_t)x, (uint16_t)y, shader.shade(x, y)); + if (d > 0) { + x += xi; + d += (2 * (dx - dy)); + } else { + d += (2 * dx); } - return; - - } else if (shader.shaderType == HGRADIENT) { - for (int16_t y = iy0; y < iy1; y++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, ShaderMethods::gradient(shader.u0, shader.scale, shader.c0, shader.c1, x)); - if (d > 0) { - x += xi; - d += (2 * (dx - dy)); - } else { - d += (2 * dx); - } - } - return; - - } else if (shader.shaderType == VGRADIENT) { - for (int16_t y = iy0; y < iy1; y++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, ShaderMethods::gradient(shader.v0, shader.scale, shader.c0, shader.c1, y)); - if (d > 0) { - x += xi; - d += (2 * (dx - dy)); - } else { - d += (2 * dx); - } - } - return; - - } else if (shader.shaderType == BUFFER) { - for (int16_t y = iy0; y < iy1; y++) { - buffer.drawPixel((uint16_t)x, (uint16_t)y, ShaderMethods::buffer(shader.u0, shader.v0, shader.buffer, x, y)); - if (d > 0) { - x += xi; - d += (2 * (dx - dy)); - } else { - d += (2 * dx); - } - } - return; - } - return; + } + return; } public: @@ -151,7 +75,8 @@ namespace UwU { uint16_t y1; // Uses Bresenham's line algorithm to draw line of any slope - void draw (Buffer buffer, Shader shader) { + template + void draw (Buffer buffer, ShaderBase& shader) { if (x0 > buffer.width || y0 > buffer.height || x1 > buffer.width || y1 > buffer.height) {return;}; int16_t ix0 = x0; int16_t iy0 = y0; diff --git a/primatives/trapezoid.cpp b/primatives/trapezoid.cpp index b67b638..c5b6408 100644 --- a/primatives/trapezoid.cpp +++ b/primatives/trapezoid.cpp @@ -6,7 +6,7 @@ #include "../datatypes.cpp" #include "../helpers.cpp" #include "../buffer.cpp" -#include "../shader.cpp" +#include "../shaders/shaders.h" namespace UwU { // trapezoid (horizontally constrained) @@ -30,7 +30,8 @@ namespace UwU { // Draw a horizontally bounded trapezoid // y1 >= y0 - void draw (Buffer buffer, Shader shader) { + template + void draw (Buffer buffer, ShaderBase& shader) { uint16_t height = 1 + y1 - y0; int16_t LeftBound[height]; int16_t RightBound[height]; @@ -38,49 +39,10 @@ namespace UwU { Helpers::bresenham(0, xl0, y1 - y0, xl1, LeftBound); Helpers::bresenham(0, xr0, y1 - y0, xr1, RightBound); - if (shader.shaderType == COLOR) { - for (uint16_t i = 0; i < height; i++) { - for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) { - buffer.drawPixel(x, i + y0, shader.c0); - } + for (uint16_t i = 0; i < height; i++) { + for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) { + buffer.drawPixel(x, i + y0, shader.shade(x, i + y0)); } - return; - - } else if (shader.shaderType == HGRADIENT) { - // find left-right boundaries - uint16_t leftmost = std::min(xl0, xl1); - uint16_t rightmost = std::max(xr0, xr1); - - // precompute gradient LUT - Color cols[rightmost - leftmost]; - for (uint16_t x = leftmost; x < rightmost; x++) { - cols[x - leftmost] = ShaderMethods::gradient(shader.u0, shader.scale, shader.c0, shader.c1, x); - } - - for (uint16_t i = 0; i < height; i++) { - for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) { - buffer.drawPixel(x, i + y0, cols[x - leftmost]); - } - } - return; - - } else if (shader.shaderType == VGRADIENT) { - Color c; - for (uint16_t i = 0; i < height; i++) { - c = ShaderMethods::gradient(shader.v0, shader.scale, shader.c0, shader.c1, i + y0); - for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) { - buffer.drawPixel(x, i + y0, c); - } - } - return; - - } else if (shader.shaderType == BUFFER) { - for (uint16_t i = 0; i < height; i++) { - for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) { - buffer.drawPixel(x, i + y0, ShaderMethods::buffer(shader.u0, shader.v0, shader.buffer, x, i + y0)); - } - } - return; } return; }