From 263444216730830b712a4f8f3a087513c5ac93e9 Mon Sep 17 00:00:00 2001 From: rodri Date: Fri, 6 Mar 2020 21:05:07 +0000 Subject: redesign of the camera abstraction. general unused/useless data cleaning. --- libgraphics/render.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) (limited to 'libgraphics/render.c') diff --git a/libgraphics/render.c b/libgraphics/render.c index ddc0663..a1819ec 100644 --- a/libgraphics/render.c +++ b/libgraphics/render.c @@ -41,26 +41,41 @@ Point toviewport(Camera *c, Point3 p) { Point2 p2; - RFrame rf = { - c->viewport->r.min.x, c->viewport->r.max.y, 1, - 1, 0, 0, - 0, -1, 0 - }; - p2 = invrframexform(flatten(c, p), rf); + p2 = invrframexform(flatten(c, p), c->viewport); return (Point){p2.x, p2.y}; } Point2 fromviewport(Camera *c, Point p) { - RFrame rf = { - c->viewport->r.min.x, c->viewport->r.max.y, 1, - 1, 0, 0, - 0, -1, 0 - }; + return rframexform(Pt2(p.x,p.y,1), c->viewport); +} + +void +perspective(Matrix3 m, double fov, double a, double n, double f) +{ + double cotan; + + cotan = 1/tan(fov/2*DEG); + identity3(m); + m[0][0] = cotan/a; + m[1][1] = cotan; + m[2][2] = -(f+n)/(f-n); + m[2][3] = -2*f*n/(f-n); + m[3][2] = -1; +} - return rframexform(Pt2(p.x, p.y, 1), rf); +void +orthographic(Matrix3 m, double l, double r, double b, double t, double n, double f) +{ + identity3(m); + m[0][0] = 2/(r - l); + m[1][1] = 2/(t - b); + m[2][2] = -2/(f - n); + m[0][3] = -(r + l)/(r - l); + m[1][3] = -(t + b)/(t - b); + m[2][3] = -(f + n)/(f - n); } void -- cgit v1.2.3