X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fobjectrenderer.cpp;h=cb96c305301f8c892d64037ee51d627bb3d484a3;hp=8b3b7e4658d4afc5be4297021b1fcb8cd74aac3d;hb=8e0633d24356301c335c20de8ab0865331b91fdb;hpb=b3c2d3472c3b3d77eae0f66731a32b852dce11f0 diff --git a/src/objectrenderer.cpp b/src/objectrenderer.cpp index 8b3b7e4..cb96c30 100644 --- a/src/objectrenderer.cpp +++ b/src/objectrenderer.cpp @@ -241,9 +241,12 @@ void BezierRenderer::RenderUsingCPU(const Objects & objects, const View & view, Real x[2]; Real y[2]; control.Evaluate(x[0], y[0], Real(0)); - int64_t blen = max((int64_t)2, min((int64_t)100, pix_bounds.w)); + //Debug("target is (%lu, %lu)", target.w, target.h); + int64_t blen = 100; + //blen = min(max((int64_t)2, (int64_t)(target.w/view.GetBounds().w)), (int64_t)100); + Real invblen(1); invblen /= blen; - Debug("Using %li lines, inverse %f", blen, Double(invblen)); + //Debug("Using %li lines, inverse %f", blen, Double(invblen)); for (int64_t j = 1; j <= blen; ++j) { control.Evaluate(x[j % 2],y[j % 2], invblen*j); @@ -282,7 +285,8 @@ void BezierRenderer::PrepareBezierGPUBuffer(const Objects& objects) GPUBezierCoeffs coeffs = { Float(bez->x0), Float(bez->y0), Float(bez->x1), Float(bez->y1), - Float(bez->x2), Float(bez->y2) + Float(bez->x2), Float(bez->y2), + Float(bez->x3), Float(bez->y3) }; builder.Add(coeffs); } @@ -419,7 +423,7 @@ void ObjectRenderer::RenderLineOnCPU(int64_t x0, int64_t y0, int64_t x1, int64_t if (neg_m) --y; else ++y; p += two_dxdy; } - } while (++x < x_end); + } while (++x <= x_end); } }