/**
* 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)
/**
* Render using GPU
*/
-void ObjectRenderer::RenderUsingGPU()
+void ObjectRenderer::RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id)
{
- if (!m_shader_program.Valid())
- Warn("Shader is invalid (objects are of type %d)", m_type);
+ unsigned first_index = 0;
+ while (m_indexes[first_index] < first_obj_id*2) first_index += 2;
+ unsigned last_index = first_index;
+ while (m_indexes[last_index] < last_obj_id*2) last_index += 2;
+
m_shader_program.Use();
m_ibo.Bind();
- glDrawElements(GL_LINES, m_indexes.size()*2, GL_UNSIGNED_INT, 0);
+ glDrawElements(GL_LINES, (last_index-first_index)*2, GL_UNSIGNED_INT, (GLvoid*)(first_index*sizeof(uint32_t)));
}
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);
}
/*
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);
}
glActiveTexture(GL_TEXTURE0);
}
-void BezierRenderer::RenderUsingGPU()
+void BezierRenderer::RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id)
{
if (!m_shader_program.Valid())
Warn("Shader is invalid (objects are of type %d)", m_type);
+
+ unsigned first_index = 0;
+ while (m_indexes[first_index] < first_obj_id*2) first_index += 2;
+ unsigned last_index = first_index;
+ while (m_indexes[last_index] < last_obj_id*2) last_index += 2;
+
m_shader_program.Use();
glUniform1i(m_shader_program.GetUniformLocation("bezier_buffer_texture"), 0);
glUniform1i(m_shader_program.GetUniformLocation("bezier_id_buffer_texture"), 1);
m_ibo.Bind();
- glDrawElements(GL_LINES, m_indexes.size()*2, GL_UNSIGNED_INT, 0);
+ glDrawElements(GL_LINES, (last_index-first_index)*2, GL_UNSIGNED_INT, (GLvoid*)(first_index*sizeof(uint32_t)));
}
/**