diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-28 17:41:38 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
commit | fd37d9065029c732d97e6fa59bc0a0d27ecd3c72 (patch) | |
tree | 32111ffa986b6338f2aa4311b2974c90ec09baff /src/mbgl/renderer/buckets/symbol_bucket.hpp | |
parent | c53cbe52461e3c1f6f4e1bb6383a6a2e3e5a2cae (diff) | |
download | qtlocation-mapboxgl-fd37d9065029c732d97e6fa59bc0a0d27ecd3c72.tar.gz |
[core] move draw mode and primitives to gfx namespace
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 4fa24aa614..5b9b11cf4d 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -91,14 +91,14 @@ public: gl::VertexVector<SymbolLayoutVertex> vertices; gl::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; gl::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<SymbolTextAttributes> segments; std::vector<PlacedSymbol> placedSymbols; optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } text; std::unique_ptr<SymbolSizeBinder> iconSizeBinder; @@ -107,7 +107,7 @@ public: gl::VertexVector<SymbolLayoutVertex> vertices; gl::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; gl::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<SymbolIconAttributes> segments; std::vector<PlacedSymbol> placedSymbols; PremultipliedImage atlasImage; @@ -115,7 +115,7 @@ public: optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } icon; struct CollisionBuffer { @@ -128,13 +128,13 @@ public: }; struct CollisionBoxBuffer : public CollisionBuffer { - gl::IndexVector<gl::Lines> lines; - optional<gl::IndexBuffer<gl::Lines>> indexBuffer; + gl::IndexVector<gfx::Lines> lines; + optional<gl::IndexBuffer<gfx::Lines>> indexBuffer; } collisionBox; struct CollisionCircleBuffer : public CollisionBuffer { - gl::IndexVector<gl::Triangles> triangles; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + gl::IndexVector<gfx::Triangles> triangles; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } collisionCircle; uint32_t bucketInstanceId = 0; |