- Expose glyph and icon information to workers via message interface.
- Glyph/SpriteAtlas track which tiles have outstanding requests
and send messages to them when glyphs/icons become available.
- Remove obsolete "updateSymbolDependentTiles" pathway
- Symbol preparation for a tile now depends on all glyphs becoming
available before it can start.
- Start tracking individual icons needed for a tile, although we don't
do anything with the information yet.
- Introduce typedef for GlyphID
85 lines
2.2 KiB
C++
85 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include <mbgl/map/mode.hpp>
|
|
#include <mbgl/tile/tile_id.hpp>
|
|
#include <mbgl/sprite/sprite_atlas.hpp>
|
|
#include <mbgl/text/glyph.hpp>
|
|
#include <mbgl/text/placement_config.hpp>
|
|
#include <mbgl/actor/actor_ref.hpp>
|
|
#include <mbgl/util/optional.hpp>
|
|
|
|
#include <atomic>
|
|
#include <memory>
|
|
|
|
namespace mbgl {
|
|
|
|
class GeometryTile;
|
|
class GeometryTileData;
|
|
class GlyphAtlas;
|
|
class SymbolLayout;
|
|
|
|
namespace style {
|
|
class Layer;
|
|
} // namespace style
|
|
|
|
class GeometryTileWorker {
|
|
public:
|
|
GeometryTileWorker(ActorRef<GeometryTileWorker> self,
|
|
ActorRef<GeometryTile> parent,
|
|
OverscaledTileID,
|
|
const std::atomic<bool>&,
|
|
const MapMode);
|
|
~GeometryTileWorker();
|
|
|
|
void setLayers(std::vector<std::unique_ptr<style::Layer>>, uint64_t correlationID);
|
|
void setData(std::unique_ptr<const GeometryTileData>, uint64_t correlationID);
|
|
void setPlacementConfig(PlacementConfig, uint64_t correlationID);
|
|
|
|
void onGlyphsAvailable(GlyphPositionMap glyphs, GlyphRangeSet loadedRanges);
|
|
void onIconsAvailable(IconAtlasMap icons);
|
|
|
|
private:
|
|
void coalesced();
|
|
void redoLayout();
|
|
void attemptPlacement();
|
|
|
|
void coalesce();
|
|
|
|
void requestNewGlyphs(const GlyphDependencies&);
|
|
void requestNewIcons(const IconDependencyMap&);
|
|
|
|
void symbolDependenciesChanged();
|
|
bool hasPendingSymbolDependencies() const;
|
|
bool hasPendingSymbolLayouts() const;
|
|
|
|
ActorRef<GeometryTileWorker> self;
|
|
ActorRef<GeometryTile> parent;
|
|
|
|
const OverscaledTileID id;
|
|
const std::atomic<bool>& obsolete;
|
|
const MapMode mode;
|
|
|
|
enum State {
|
|
Idle,
|
|
Coalescing,
|
|
NeedLayout,
|
|
NeedPlacement
|
|
};
|
|
|
|
State state = Idle;
|
|
uint64_t correlationID = 0;
|
|
|
|
// Outer optional indicates whether we've received it or not.
|
|
optional<std::vector<std::unique_ptr<style::Layer>>> layers;
|
|
optional<std::unique_ptr<const GeometryTileData>> data;
|
|
optional<PlacementConfig> placementConfig;
|
|
|
|
std::vector<std::unique_ptr<SymbolLayout>> symbolLayouts;
|
|
GlyphDependencies pendingGlyphDependencies;
|
|
IconDependencyMap pendingIconDependencies;
|
|
GlyphPositionMap glyphPositions;
|
|
IconAtlasMap icons;
|
|
};
|
|
|
|
} // namespace mbgl
|