parse line width function and call tile destructor from main thread

This commit is contained in:
Konstantin Käfer
2014-01-29 12:25:50 +01:00
parent 04e16cf2ca
commit d5cae14770
9 changed files with 70 additions and 24 deletions

View File

@@ -84,6 +84,7 @@ void Painter::setupShaders() {
void Painter::teardown() {
glDeleteBuffers(1, &tile_stencil_buffer);
glDeleteBuffers(1, &tile_border_buffer);
}
void Painter::changeMatrix(const Tile::Ptr& tile) {
@@ -152,17 +153,6 @@ void Painter::render(const Tile::Ptr& tile) {
drawClippingMask();
// switchShader(outlineShader);
// glUniformMatrix4fv(outlineShader->u_matrix, 1, GL_FALSE, matrix);
// // draw lines:
// tile->lineVertex.bind();
// glVertexAttribPointer(outlineShader->a_pos, 2, GL_SHORT, GL_FALSE, 0, BUFFER_OFFSET(0));
// glUniform4f(outlineShader->u_color, 0.0f, 0.0f, 0.0f, 1.0f);
// glUniform2f(outlineShader->u_world, transform.fb_width, transform.fb_height);
// glLineWidth(2.0f);
// glDrawArrays(GL_LINE_STRIP, 0, tile->lineVertex.length());
renderLayers(tile, style.layers);
if (settings.debug) {
@@ -374,7 +364,7 @@ void Painter::renderLine(LineBucket& bucket, const std::string& layer_name) {
// color[3] = Infinity;
// glUniform4fv(lineShader->u_color, color);
// } else {
glUniform4fv(lineShader->u_color, 1, properties.color.data());
glUniform4fv(lineShader->u_color, 1, properties.color.data());
// }