From 23198d793562718589d0242efaa9185c5e881007 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 18 Jul 2017 10:03:45 -0700 Subject: [core] Inline Painter::renderCircle --- cmake/core-files.cmake | 1 - src/mbgl/renderer/layers/render_circle_layer.cpp | 53 ++++++++++++++++++--- src/mbgl/renderer/painter.hpp | 3 -- src/mbgl/renderer/painters/painter_circle.cpp | 60 ------------------------ 4 files changed, 46 insertions(+), 71 deletions(-) delete mode 100644 src/mbgl/renderer/painters/painter_circle.cpp diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index f00f30cdb4..948ac2a733 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -245,7 +245,6 @@ set(MBGL_CORE_FILES src/mbgl/renderer/layers/render_symbol_layer.hpp # renderer/painters - src/mbgl/renderer/painters/painter_circle.cpp src/mbgl/renderer/painters/painter_clipping.cpp src/mbgl/renderer/painters/painter_debug.cpp src/mbgl/renderer/painters/painter_fill.cpp diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index c80b7bd27d..22e515e603 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -2,6 +2,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -10,6 +13,8 @@ namespace mbgl { +using namespace style; + RenderCircleLayer::RenderCircleLayer(Immutable _impl) : RenderLayer(style::LayerType::Circle, _impl), unevaluated(impl().paint.untransitioned()) { @@ -44,14 +49,48 @@ bool RenderCircleLayer::hasTransition() const { } void RenderCircleLayer::render(Painter& painter, PaintParameters& parameters, RenderSource*) { + if (painter.pass == RenderPass::Opaque) { + return; + } + + const bool scaleWithMap = evaluated.get() == CirclePitchScaleType::Map; + const bool pitchWithMap = evaluated.get() == AlignmentType::Map; + for (const RenderTile& tile : renderTiles) { - Bucket* bucket = tile.tile.getBucket(*baseImpl); - assert(dynamic_cast(bucket)); - painter.renderCircle( - parameters, - *reinterpret_cast(bucket), - *this, - tile); + assert(dynamic_cast(tile.tile.getBucket(*baseImpl))); + CircleBucket& bucket = *reinterpret_cast(tile.tile.getBucket(*baseImpl)); + + parameters.programs.circle.get(evaluated).draw( + painter.context, + gl::Triangles(), + painter.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + painter.frame.mapMode == MapMode::Still + ? painter.stencilModeForClipping(tile.clip) + : gl::StencilMode::disabled(), + painter.colorModeForRenderPass(), + CircleProgram::UniformValues { + uniforms::u_matrix::Value{ + tile.translatedMatrix(evaluated.get(), + evaluated.get(), + painter.state) + }, + uniforms::u_scale_with_map::Value{ scaleWithMap }, + uniforms::u_extrude_scale::Value{ pitchWithMap + ? std::array {{ + tile.id.pixelsToTileUnits(1, painter.state.getZoom()), + tile.id.pixelsToTileUnits(1, painter.state.getZoom()) }} + : painter.pixelsToGLUnits }, + uniforms::u_camera_to_center_distance::Value{ painter.state.getCameraToCenterDistance() }, + uniforms::u_pitch_with_map::Value{ pitchWithMap } + }, + *bucket.vertexBuffer, + *bucket.indexBuffer, + bucket.segments, + bucket.paintPropertyBinders.at(getID()), + evaluated, + painter.state.getZoom(), + getID() + ); } } diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index ca90f6a1f0..645ddfd3ab 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -42,14 +42,12 @@ class DebugBucket; class FillBucket; class FillExtrusionBucket; class LineBucket; -class CircleBucket; class SymbolBucket; class RasterBucket; class RenderFillLayer; class RenderFillExtrusionLayer; class RenderLineLayer; -class RenderCircleLayer; class RenderSymbolLayer; class RenderRasterLayer; @@ -84,7 +82,6 @@ public: void renderFill(PaintParameters&, FillBucket&, const RenderFillLayer&, const RenderTile&); void renderFillExtrusion(PaintParameters&, FillExtrusionBucket&, const RenderFillExtrusionLayer&, const RenderTile&); void renderLine(PaintParameters&, LineBucket&, const RenderLineLayer&, const RenderTile&); - void renderCircle(PaintParameters&, CircleBucket&, const RenderCircleLayer&, const RenderTile&); void renderSymbol(PaintParameters&, SymbolBucket&, const RenderSymbolLayer&, const RenderTile&); void renderRaster(PaintParameters&, RasterBucket&, const RenderRasterLayer&, const mat4&, bool useBucketBuffers /* = false */); diff --git a/src/mbgl/renderer/painters/painter_circle.cpp b/src/mbgl/renderer/painters/painter_circle.cpp deleted file mode 100644 index 72a17d19fb..0000000000 --- a/src/mbgl/renderer/painters/painter_circle.cpp +++ /dev/null @@ -1,60 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace mbgl { - -using namespace style; - -void Painter::renderCircle(PaintParameters& parameters, - CircleBucket& bucket, - const RenderCircleLayer& layer, - const RenderTile& tile) { - if (pass == RenderPass::Opaque) { - return; - } - - const CirclePaintProperties::PossiblyEvaluated& properties = layer.evaluated; - const bool scaleWithMap = properties.get() == CirclePitchScaleType::Map; - const bool pitchWithMap = properties.get() == AlignmentType::Map; - - parameters.programs.circle.get(properties).draw( - context, - gl::Triangles(), - depthModeForSublayer(0, gl::DepthMode::ReadOnly), - frame.mapMode == MapMode::Still - ? stencilModeForClipping(tile.clip) - : gl::StencilMode::disabled(), - colorModeForRenderPass(), - CircleProgram::UniformValues { - uniforms::u_matrix::Value{ - tile.translatedMatrix(properties.get(), - properties.get(), - state) - }, - uniforms::u_scale_with_map::Value{ scaleWithMap }, - uniforms::u_extrude_scale::Value{ pitchWithMap - ? std::array {{ - tile.id.pixelsToTileUnits(1, state.getZoom()), - tile.id.pixelsToTileUnits(1, state.getZoom()) }} - : pixelsToGLUnits }, - uniforms::u_camera_to_center_distance::Value{ state.getCameraToCenterDistance() }, - uniforms::u_pitch_with_map::Value{ pitchWithMap } - }, - *bucket.vertexBuffer, - *bucket.indexBuffer, - bucket.segments, - bucket.paintPropertyBinders.at(layer.getID()), - properties, - state.getZoom(), - layer.getID() - ); -} - -} // namespace mbgl -- cgit v1.2.1