diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-11-06 11:52:26 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2017-11-06 11:59:06 -0800 |
| commit | bc4f35cd7b743b04d1910ab28a612d1c49be910d (patch) | |
| tree | f11e8c7f47122d715ae4a65bb6f45763c4a81d05 /src/mbgl/renderer/layers/render_symbol_layer.cpp | |
| parent | 3b3009014fff3704a4d836dc4617cd603e6f40ee (diff) | |
| download | qtlocation-mapboxgl-bc4f35cd7b743b04d1910ab28a612d1c49be910d.tar.gz | |
Rename CollisionBoxOpacityAttributes -> CollisionBoxDynamicAttributes.
They're not really about opacity.
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 7352b766d9..e194c9c857 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -237,7 +237,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gl::Lines { 1.0f }, gl::DepthMode::disabled(), - gl::StencilMode::disabled(), // TODO //parameters.stencilModeForClipping(tile.clip), + gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), CollisionBoxProgram::UniformValues { uniforms::u_matrix::Value{ tile.matrix }, @@ -245,7 +245,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() } }, *bucket.collisionBox.vertexBuffer, - *bucket.collisionBox.opacityVertexBuffer, + *bucket.collisionBox.dynamicVertexBuffer, *bucket.collisionBox.indexBuffer, bucket.collisionBox.segments, paintAttributeData, @@ -271,7 +271,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gl::Triangles(), gl::DepthMode::disabled(), - gl::StencilMode::disabled(), // TODO //parameters.stencilModeForClipping(tile.clip), + gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), CollisionBoxProgram::UniformValues { uniforms::u_matrix::Value{ tile.matrix }, @@ -279,7 +279,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() } }, *bucket.collisionCircle.vertexBuffer, - *bucket.collisionCircle.opacityVertexBuffer, + *bucket.collisionCircle.dynamicVertexBuffer, *bucket.collisionCircle.indexBuffer, bucket.collisionCircle.segments, paintAttributeData, |