Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove saveLayers property from PolylineLayer & save layers automatically when required #1519

Merged
merged 3 commits into from
May 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions example/lib/pages/polyline.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,50 @@ class _PolylinePageState extends State<PolylinePage> {
late Future<List<Polyline>> polylines;

Future<List<Polyline>> getPolylines() async {
final polyLines = [
final polyLines = <Polyline>[
Polyline(
points: [
LatLng(50.5, -0.09),
LatLng(51.3498, -6.2603),
LatLng(53.8566, 2.3522),
],
strokeWidth: 50,
strokeWidth: 20,
color: Colors.blue.withOpacity(0.6),
borderStrokeWidth: 20,
borderColor: Colors.red.withOpacity(0.4),
),
Polyline(
points: [
LatLng(50.2, -0.08),
LatLng(51.2498, -7.2603),
LatLng(54.8566, 1.3522),
],
strokeWidth: 20,
color: Colors.black.withOpacity(0.2),
borderStrokeWidth: 20,
borderColor: Colors.white30,
),
Polyline(
points: [
LatLng(49.1, -0.06),
LatLng(51.15, -7.4),
LatLng(55.5, 0.8),
],
strokeWidth: 10,
color: Colors.yellow,
borderStrokeWidth: 10,
borderColor: Colors.blue.withOpacity(0.5),
),
Polyline(
points: [
LatLng(48.1, -0.03),
LatLng(50.5, -7.8),
LatLng(56.5, 0.4),
],
strokeWidth: 10,
color: Colors.amber,
borderStrokeWidth: 10,
borderColor: Colors.blue.withOpacity(0.5),
),
];
await Future<void>.delayed(const Duration(seconds: 3));
Expand Down
81 changes: 38 additions & 43 deletions lib/src/layer/polyline_layer.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:core';
import 'dart:ui' as ui;

import 'package:flutter/widgets.dart';
Expand Down Expand Up @@ -58,21 +59,12 @@ class PolylineLayer extends StatelessWidget {

final bool polylineCulling;

/// {@macro newPolylinePainter.saveLayers}
///
/// By default, this value is set to `false` to improve performance on
/// layers containing a lot of polylines.
///
/// You might want to set this to `true` if you get unwanted darker lines
/// where they overlap but, keep in mind that this might reduce the
/// performance of the layer.
final bool saveLayers;

const PolylineLayer({
super.key,
this.polylines = const [],
this.polylineCulling = false,
this.saveLayers = false,
@Deprecated('No longer needed and will be removed.')
bool saveLayers = false,
});

@override
Expand All @@ -87,7 +79,7 @@ class PolylineLayer extends StatelessWidget {
: polylines;

return CustomPaint(
painter: PolylinePainter(lines, saveLayers, map),
painter: PolylinePainter(lines, map),
size: size,
isComplex: true,
);
Expand All @@ -97,17 +89,10 @@ class PolylineLayer extends StatelessWidget {
class PolylinePainter extends CustomPainter {
final List<Polyline> polylines;

/// {@template newPolylinePainter.saveLayers}
/// If `true`, the canvas will be updated on every frame by calling the
/// methods [Canvas.saveLayer] and [Canvas.restore].
/// {@endtemplate}
final bool saveLayers;

final FlutterMapState map;
final LatLngBounds bounds;

PolylinePainter(this.polylines, this.saveLayers, this.map)
: bounds = map.bounds;
PolylinePainter(this.polylines, this.map) : bounds = map.bounds;

int get hash {
_hash ??= Object.hashAll(polylines);
Expand All @@ -134,26 +119,35 @@ class PolylinePainter extends CustomPainter {
var borderPath = ui.Path();
var filterPath = ui.Path();
var paint = Paint();
bool needsLayerSaving = false;

Paint? borderPaint;
Paint? filterPaint;
int? lastHash;

void drawPaths() {
canvas.drawPath(path, paint);
path = ui.Path();
paint = Paint();
final hasBorder = borderPaint != null && filterPaint != null;
if (hasBorder) {
if (needsLayerSaving) {
canvas.saveLayer(rect, Paint());
}

if (borderPaint != null) {
canvas.drawPath(borderPath, borderPaint!);
borderPath = ui.Path();
borderPaint = null;
}

if (filterPaint != null) {
canvas.drawPath(filterPath, filterPaint!);
filterPath = ui.Path();
filterPaint = null;
if (needsLayerSaving) {
canvas.drawPath(filterPath, filterPaint!);
filterPath = ui.Path();
filterPaint = null;

canvas.restore();
}
}

canvas.drawPath(path, paint);
path = ui.Path();
paint = Paint();
}

for (final polyline in polylines) {
Expand All @@ -163,10 +157,12 @@ class PolylinePainter extends CustomPainter {
}

final hash = polyline.renderHashCode;
if (lastHash != null && lastHash != hash) {
if (needsLayerSaving || (lastHash != null && lastHash != hash)) {
drawPaths();
}
lastHash = hash;
needsLayerSaving = polyline.color.opacity < 1.0 ||
(polyline.gradientColors?.any((c) => c.opacity < 1.0) ?? false);

late final double strokeWidth;
if (polyline.useStrokeWidthInMeter) {
Expand Down Expand Up @@ -200,30 +196,30 @@ class PolylinePainter extends CustomPainter {
: paint.color = polyline.color;
}

if (polyline.borderColor != null) {
filterPaint = Paint()
..color = polyline.borderColor!.withAlpha(255)
..strokeWidth = strokeWidth
..strokeCap = polyline.strokeCap
..strokeJoin = polyline.strokeJoin
..style = isDotted ? PaintingStyle.fill : PaintingStyle.stroke
..blendMode = BlendMode.dstOut;
}

if (polyline.borderStrokeWidth > 0.0) {
if (polyline.borderColor != null && polyline.borderStrokeWidth > 0.0) {
// Outlined lines are drawn by drawing a thicker path underneath, then
// stenciling the middle (in case the line fill is transparent), and
// finally drawing the line fill.
borderPaint = Paint()
..color = polyline.borderColor ?? const Color(0x00000000)
..strokeWidth = strokeWidth + polyline.borderStrokeWidth
..strokeCap = polyline.strokeCap
..strokeJoin = polyline.strokeJoin
..style = isDotted ? PaintingStyle.fill : PaintingStyle.stroke
..blendMode = BlendMode.srcOver;

filterPaint = Paint()
..color = polyline.borderColor!.withAlpha(255)
..strokeWidth = strokeWidth
..strokeCap = polyline.strokeCap
..strokeJoin = polyline.strokeJoin
..style = isDotted ? PaintingStyle.fill : PaintingStyle.stroke
..blendMode = BlendMode.dstOut;
}

final radius = paint.strokeWidth / 2;
final borderRadius = (borderPaint?.strokeWidth ?? 0) / 2;

if (saveLayers) canvas.saveLayer(rect, Paint());
if (isDotted) {
final spacing = strokeWidth * 1.5;
if (borderPaint != null && filterPaint != null) {
Expand All @@ -238,7 +234,6 @@ class PolylinePainter extends CustomPainter {
}
_paintLine(path, offsets);
}
if (saveLayers) canvas.restore();
}

drawPaths();
Expand Down