[core] Refactor CustomLayer internals

Move the responsibility for initialization/deinitialization/rendering to RenderCustomLayer. This eliminates special case code from Map and Style.
This commit is contained in:
John Firebaugh
2017-06-14 16:21:02 -07:00
parent e4201e207c
commit be7e9bbb8d
10 changed files with 70 additions and 85 deletions

View File

@@ -1,5 +1,4 @@
#include <mbgl/style/layers/custom_layer_impl.hpp>
#include <mbgl/map/transform_state.hpp>
namespace mbgl {
namespace style {
@@ -23,33 +22,5 @@ bool CustomLayer::Impl::hasLayoutDifference(const Layer::Impl&) const {
void CustomLayer::Impl::stringifyLayout(rapidjson::Writer<rapidjson::StringBuffer>&) const {
}
void CustomLayer::Impl::initialize() const {
assert(initializeFn);
initializeFn(context);
}
void CustomLayer::Impl::deinitialize() const {
if (deinitializeFn) {
deinitializeFn(context);
}
}
void CustomLayer::Impl::render(const TransformState& state) const {
assert(renderFn);
CustomLayerRenderParameters parameters;
parameters.width = state.getSize().width;
parameters.height = state.getSize().height;
parameters.latitude = state.getLatLng().latitude();
parameters.longitude = state.getLatLng().longitude();
parameters.zoom = state.getZoom();
parameters.bearing = -state.getAngle() * util::RAD2DEG;
parameters.pitch = state.getPitch();
parameters.fieldOfView = state.getFieldOfView();
renderFn(context, parameters);
}
} // namespace style
} // namespace mbgl