git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Maybe don't use all of the lines. Or maybe do.
[ipdf/code.git]
/
src
/
objectrenderer.cpp
diff --git
a/src/objectrenderer.cpp
b/src/objectrenderer.cpp
index
755df98
..
ac25c4a
100644
(file)
--- a/
src/objectrenderer.cpp
+++ b/
src/objectrenderer.cpp
@@
-13,7
+13,9
@@
namespace IPDF
/**
* ObjectRenderer constructor
/**
* ObjectRenderer constructor
- * Note we cannot compile the shaders in the constructor because the Screen class needs to initialise GL and it has a ShaderProgram member
+ * Note we cannot compile the shaders in the ShaderProgram constructor
+ * because the Screen class needs to initialise GL first and it has a
+ * ShaderProgram member
*/
ObjectRenderer::ObjectRenderer(const ObjectType & type,
const char * vert_glsl_file, const char * frag_glsl_file, const char * geom_glsl_file)
*/
ObjectRenderer::ObjectRenderer(const ObjectType & type,
const char * vert_glsl_file, const char * frag_glsl_file, const char * geom_glsl_file)
@@
-225,10
+227,13
@@
void BezierRenderer::RenderUsingCPU(const Objects & objects, const View & view,
Real x[2]; Real y[2];
control.Evaluate(x[0], y[0], Real(0));
Real x[2]; Real y[2];
control.Evaluate(x[0], y[0], Real(0));
- for (unsigned j = 1; j <= 100; ++j)
+ int64_t blen = max(2L, min(100L, pix_bounds.w));
+ Real invblen(1); invblen /= blen;
+ 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],
Real(0.01)*j);
- ObjectRenderer::RenderLineOnCPU((int64_t)
x[0],(int64_t)y[0], (int64_t)x[1],(int64_t)y[1]
, target);
+ control.Evaluate(x[j % 2],y[j % 2],
invblen*j);
+ ObjectRenderer::RenderLineOnCPU((int64_t)
Double(x[0]),(int64_t)Double(y[0]), (int64_t)Double(x[1]),(int64_t)Double(y[1])
, target);
}
/*
}
/*
@@
-261,9
+266,9
@@
void BezierRenderer::PrepareBezierGPUBuffer(const Objects& objects)
for (auto bez : objects.beziers)
{
GPUBezierCoeffs coeffs = {
for (auto bez : objects.beziers)
{
GPUBezierCoeffs coeffs = {
-
(float)bez.x0, (float)bez.y0
,
-
(float)bez.x1 - (float)bez.x0, (float)bez.y1 - (float)bez.y0
,
- (float)bez.x2 - (float)bez.x0, (float)bez.y2 - (float)bez.y0
+
Float(bez.x0), Float(bez.y0)
,
+
Float(bez.x1 - bez.x0), Float(bez.y1 - bez.y0)
,
+ Float(bez.x2 - bez.x0), Float(bez.y2 - bez.y0)
};
builder.Add(coeffs);
}
};
builder.Add(coeffs);
}
UCC
git Repository :: git.ucc.asn.au