This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
[core] Introduce StyleLayer subclasses #2730
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -64,29 +65,6 @@ void TileWorker::redoPlacement(float angle, float pitch, bool collisionDebug) { | |||
| } | |||
|
|
|||
| template <typename T> | |||
| struct PropertyEvaluator { | |||
There was a problem hiding this comment.
PropertyEvaluator was duplicated in two places and another part of this commit is pulling it out to mbgl/style/property_evaluator.hpp.
3 tasks
|
|
||
| inline bool isVisible() const { | ||
| return opacity > 0; | ||
| } | ||
| }; |
There was a problem hiding this comment.
What about adding a PaintProperties that every ____PaintProperties inherits containing isVisible as a pure virtual?
There was a problem hiding this comment.
We'd want to do that only if we actually needed runtime polymorphism from PaintProperties. So far I don't see the need -- everywhere isVisible() is currently used, it's with a concrete type.
|
This is great stuff! 👍 particularly excited about the way how |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Second in a series of PRs that builds towards a full-fledged programmatic style API. This is a big chunk of work, but I'm trying to break it up step by step and not create a long-lived branch with a lot of changes.
This change introduces subclasses of
StyleLayer, one for each layer type. Each subclass holds an instance of the appropriate___PaintPropertiesthat we introduced in the previous commit. That means we can eliminate theStylePropertiesvariant. (Well, not completely:ShapeAnnotationstill uses a version reduced to varying betweenLinePaintPropertiesandFillPaintProperties.)We can also move the explicit instantiations of
StyleLayer::applyStyleProperties(one for each layer type) into pure virtualStyleLayer::applyStylePropertiesand subclass implementations. Future commits in this series will make similar changes, replacingswitchortemplatepolymorphism with good old type polymorphism.👀 @kkaefer @brunoabinader