Skip to content

Commit

Permalink
perf: add Canvas.drawVertices render pathway for PolygonLayer & f…
Browse files Browse the repository at this point in the history 
…ix bundled drawing (#1800)

Co-authored-by: Sebastian <[email protected]>
  • Loading branch information
@JaffaKetchup @ignatz
JaffaKetchup and ignatz authored Feb 13, 2024
1 parent 75d0381 commit f9d37df
Show file tree
Hide file tree
Showing 17 changed files with 461 additions and 172 deletions.
9 changes: 4 additions & 5 deletions example/lib/pages/many_circles.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ class ManyCirclesPageState extends State<ManyCirclesPage> {
source.nextDouble() * (end - start) + start;
List<CircleMarker> allCircles = [];

static const int _initialNumOfCircles = _maxCirclesCount ~/ 10;
int numOfCircles = _initialNumOfCircles;
int numOfCircles = _maxCirclesCount ~/ 10;

@override
void initState() {
Expand Down Expand Up @@ -85,10 +84,10 @@ class ManyCirclesPageState extends State<ManyCirclesPage> {
top: 16,
right: 16,
child: NumberOfItemsSlider(
itemDescription: 'Circle',
number: numOfCircles,
onChanged: (v) => setState(() => numOfCircles = v),
maxNumber: _maxCirclesCount,
initialNumber: _initialNumOfCircles,
onChangedNumber: (v) => setState(() => numOfCircles = v),
itemDescription: 'Circle',
),
),
if (!kIsWeb)
Expand Down
9 changes: 4 additions & 5 deletions example/lib/pages/many_markers.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ class ManyMarkersPageState extends State<ManyMarkersPage> {
source.nextDouble() * (end - start) + start;
List<Marker> allMarkers = [];

static const int _initialNumOfMarkers = _maxMarkersCount ~/ 10;
int numOfMarkers = _initialNumOfMarkers;
int numOfMarkers = _maxMarkersCount ~/ 10;

@override
void initState() {
Expand Down Expand Up @@ -86,10 +85,10 @@ class ManyMarkersPageState extends State<ManyMarkersPage> {
top: 16,
right: 16,
child: NumberOfItemsSlider(
itemDescription: 'Marker',
number: numOfMarkers,
onChanged: (v) => setState(() => numOfMarkers = v),
maxNumber: _maxMarkersCount,
initialNumber: _initialNumOfMarkers,
onChangedNumber: (v) => setState(() => numOfMarkers = v),
itemDescription: 'Marker',
),
),
if (!kIsWeb)
Expand Down
116 changes: 88 additions & 28 deletions example/lib/pages/polygon.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ class PolygonPage extends StatelessWidget {
LatLng(54.3498, -6.2603),
LatLng(52.8566, 2.3522),
];
final _notFilledDotedPoints = const [
LatLng(49.29, -2.57),
LatLng(51.46, -6.43),
LatLng(49.86, -8.17),
LatLng(48.39, -3.49),
];
final _filledDotedPoints = const [
LatLng(46.35, 4.94),
LatLng(46.22, -0.11),
Expand All @@ -43,17 +37,36 @@ class PolygonPage extends StatelessWidget {
LatLng(59.77, -7.01),
LatLng(60.77, -6.01),
];
final _holeOuterPoints = const [
final _normalHoleOuterPoints = const [
LatLng(50, -18),
LatLng(50, -14),
LatLng(51.5, -12.5),
LatLng(54, -14),
LatLng(54, -18),
];
final _brokenHoleOuterPoints = const [
LatLng(50, -18),
LatLng(53, -16),
LatLng(51.5, -12.5),
LatLng(54, -14),
LatLng(54, -18),
];
final _holeInnerPoints = const [
LatLng(51, -17),
LatLng(51, -16),
LatLng(52, -16),
LatLng(52, -17),
[
LatLng(52, -17),
LatLng(52, -16),
LatLng(51.5, -15.5),
LatLng(51, -16),
LatLng(51, -17),
],
[
LatLng(53.5, -17),
LatLng(53.5, -16),
LatLng(53, -15),
LatLng(52.25, -15),
LatLng(52.25, -16),
LatLng(52.75, -17),
],
];

@override
Expand Down Expand Up @@ -84,12 +97,6 @@ class PolygonPage extends StatelessWidget {
borderColor: Colors.yellow,
borderStrokeWidth: 4,
),
Polygon(
points: _notFilledDotedPoints,
isDotted: true,
borderColor: Colors.green,
borderStrokeWidth: 4,
),
Polygon(
points: _filledDotedPoints,
isDotted: true,
Expand All @@ -112,25 +119,78 @@ class PolygonPage extends StatelessWidget {
labelPlacement: PolygonLabelPlacement.polylabel,
),
Polygon(
points: _holeOuterPoints,
holePointsList: [_holeInnerPoints],
points: _normalHoleOuterPoints
.map((latlng) =>
LatLng(latlng.latitude, latlng.longitude + 8))
.toList(),
isDotted: true,
holePointsList: _holeInnerPoints
.map(
(latlngs) => latlngs
.map((latlng) =>
LatLng(latlng.latitude, latlng.longitude + 8))
.toList(),
)
.toList(),
borderStrokeWidth: 4,
borderColor: Colors.green,
borderColor: Colors.orange,
color: Colors.orange.withOpacity(0.5),
label: 'This one is not\nperformantly rendered',
rotateLabel: true,
labelPlacement: PolygonLabelPlacement.centroid,
labelStyle: const TextStyle(color: Colors.black),
),
Polygon(
points: _holeOuterPoints
points: _brokenHoleOuterPoints
.map((latlng) =>
LatLng(latlng.latitude, latlng.longitude + 8))
LatLng(latlng.latitude - 6, latlng.longitude + 8))
.toList(),
isDotted: true,
holePointsList: [
_holeInnerPoints
.map((latlng) =>
LatLng(latlng.latitude, latlng.longitude + 8))
.toList()
],
holePointsList: _holeInnerPoints
.map(
(latlngs) => latlngs
.map((latlng) => LatLng(
latlng.latitude - 6, latlng.longitude + 8))
.toList(),
)
.toList(),
borderStrokeWidth: 4,
borderColor: Colors.orange,
color: Colors.orange.withOpacity(0.5),
label: 'This one is not\nperformantly rendered',
rotateLabel: true,
labelPlacement: PolygonLabelPlacement.centroid,
labelStyle: const TextStyle(color: Colors.black),
),
],
),
PolygonLayer(
simplificationTolerance: 0,
useAltRendering: true,
polygons: [
Polygon(
points: _normalHoleOuterPoints,
holePointsList: _holeInnerPoints,
borderStrokeWidth: 4,
borderColor: Colors.black,
color: Colors.green,
),
Polygon(
points: _brokenHoleOuterPoints
.map((latlng) =>
LatLng(latlng.latitude - 6, latlng.longitude))
.toList(),
holePointsList: _holeInnerPoints
.map(
(latlngs) => latlngs
.map((latlng) =>
LatLng(latlng.latitude - 6, latlng.longitude))
.toList(),
)
.toList(),
borderStrokeWidth: 4,
borderColor: Colors.black,
color: Colors.green,
),
],
),
Expand Down
Loading

0 comments on commit f9d37df

Please sign in to comment.