tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename point => icon

Browse Source
This commit is contained in:
Konstantin Käfer
2014-05-15 14:51:02 +02:00
parent aeae6248ad
commit fda64b67af
25 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/llmr/geometry/point_buffer.hpp → include/llmr/geometry/icon_buffer.hpp
View File

@@ -1,11 +1,11 @@
#ifndef LLMR_GEOMETRY_POINT_BUFFER
#define LLMR_GEOMETRY_POINT_BUFFER
#ifndef LLMR_GEOMETRY_ICON_BUFFER
#define LLMR_GEOMETRY_ICON_BUFFER
#include "buffer.hpp"
namespace llmr {
class PointVertexBuffer : public Buffer<
class IconVertexBuffer : public Buffer<
4 // 2 coordinates per vertex (== 4 bytes)
> {
public:

2
include/llmr/map/tile_parser.hpp
View File

@@ -24,7 +24,7 @@ private:
std::unique_ptr<Bucket> createBucket(const BucketDescription& bucket_desc);
std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const BucketDescription& bucket_desc);
std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const BucketDescription& bucket_desc);
std::unique_ptr<Bucket> createPointBucket(const VectorTileLayer& layer, const BucketDescription& bucket_desc);
std::unique_ptr<Bucket> createIconBucket(const VectorTileLayer& layer, const BucketDescription& bucket_desc);
std::unique_ptr<Bucket> createTextBucket(const VectorTileLayer& layer, const BucketDescription& bucket_desc);
template <class Bucket> void addBucketFeatures(Bucket& bucket, const VectorTileLayer& layer, const BucketDescription& bucket_desc);

4
include/llmr/map/vector_tile_data.hpp
View File

@@ -10,7 +10,7 @@
#include <llmr/geometry/elements_buffer.hpp>
#include <llmr/geometry/fill_buffer.hpp>
#include <llmr/geometry/line_buffer.hpp>
#include <llmr/geometry/point_buffer.hpp>
#include <llmr/geometry/icon_buffer.hpp>
#include <llmr/geometry/text_buffer.hpp>
#include <map>
@@ -33,7 +33,7 @@ protected:
// Holds the actual geometries in this tile.
FillVertexBuffer fillVertexBuffer;
LineVertexBuffer lineVertexBuffer;
PointVertexBuffer pointVertexBuffer;
IconVertexBuffer iconVertexBuffer;
TextVertexBuffer textVertexBuffer;
TriangleElementsBuffer triangleElementsBuffer;

20
include/llmr/renderer/point_bucket.hpp → include/llmr/renderer/icon_bucket.hpp
View File

@@ -1,10 +1,10 @@
#ifndef LLMR_RENDERER_POINTBUCKET
#define LLMR_RENDERER_POINTBUCKET
#ifndef LLMR_RENDERER_ICONBUCKET
#define LLMR_RENDERER_ICONBUCKET
#include <llmr/renderer/bucket.hpp>
#include <llmr/style/bucket_description.hpp>
#include <llmr/geometry/elements_buffer.hpp>
#include <llmr/geometry/point_buffer.hpp>
#include <llmr/geometry/icon_buffer.hpp>
#include <vector>
#include <memory>
@@ -16,15 +16,15 @@
namespace llmr {
class Style;
class PointVertexBuffer;
class IconVertexBuffer;
class BucketDescription;
class PointShader;
class IconShader;
class DotShader;
struct pbf;
class PointBucket : public Bucket {
class IconBucket : public Bucket {
public:
PointBucket(PointVertexBuffer& vertexBuffer,
IconBucket(IconVertexBuffer& vertexBuffer,
const BucketDescription& bucket_desc);
virtual void render(Painter& painter, const std::string& layer_name, const Tile::ID& id);
@@ -32,15 +32,15 @@ public:
void addGeometry(pbf& data);
void drawPoints(PointShader& shader);
void drawPoints(DotShader& shader);
void drawIcons(IconShader& shader);
void drawIcons(DotShader& shader);
public:
const BucketGeometryDescription geometry;
private:
PointVertexBuffer& vertexBuffer;
IconVertexBuffer& vertexBuffer;
VertexArrayObject array;
const size_t vertex_start;

8
include/llmr/renderer/painter.hpp
View File

@@ -14,7 +14,7 @@
#include <llmr/shader/pattern_shader.hpp>
#include <llmr/shader/line_shader.hpp>
#include <llmr/shader/linejoin_shader.hpp>
#include <llmr/shader/point_shader.hpp>
#include <llmr/shader/icon_shader.hpp>
#include <llmr/shader/raster_shader.hpp>
#include <llmr/shader/text_shader.hpp>
#include <llmr/shader/dot_shader.hpp>
@@ -30,7 +30,7 @@ class GlyphAtlas;
class FillBucket;
class LineBucket;
class PointBucket;
class IconBucket;
class TextBucket;
class RasterBucket;
@@ -65,7 +65,7 @@ public:
void renderDebugText(const std::vector<std::string> &strings);
void renderFill(FillBucket& bucket, const std::string& layer_name, const Tile::ID& id);
void renderLine(LineBucket& bucket, const std::string& layer_name, const Tile::ID& id);
void renderPoint(PointBucket& bucket, const std::string& layer_name, const Tile::ID& id);
void renderIcon(IconBucket& bucket, const std::string& layer_name, const Tile::ID& id);
void renderText(TextBucket& bucket, const std::string& layer_name, const Tile::ID& id);
void renderRaster(RasterBucket& bucket, const std::string& layer_name, const Tile::ID& id);
@@ -123,7 +123,7 @@ private:
std::unique_ptr<LineShader> lineShader;
std::unique_ptr<LinejoinShader> linejoinShader;
std::unique_ptr<PatternShader> patternShader;
std::unique_ptr<PointShader> pointShader;
std::unique_ptr<IconShader> iconShader;
std::unique_ptr<RasterShader> rasterShader;
std::unique_ptr<TextShader> textShader;
std::unique_ptr<DotShader> dotShader;

8
include/llmr/shader/point_shader.hpp → include/llmr/shader/icon_shader.hpp
View File

@@ -1,13 +1,13 @@
#ifndef LLMR_SHADER_SHADER_POINT
#define LLMR_SHADER_SHADER_POINT
#ifndef LLMR_SHADER_SHADER_ICON
#define LLMR_SHADER_SHADER_ICON
#include <llmr/shader/shader.hpp>
namespace llmr {
class PointShader : public Shader {
class IconShader : public Shader {
public:
PointShader();
IconShader();
void bind(char *offset);

4
include/llmr/style/bucket_description.hpp
View File

@@ -13,7 +13,7 @@ enum class BucketType {
None = 0,
Fill = 1,
Line = 2,
Point = 3,
Icon = 3,
Text = 4,
Raster = 5
};
@@ -41,7 +41,7 @@ enum class TextPathType {
inline BucketType bucketType(const std::string& type) {
if (type == "fill") return BucketType::Fill;
else if (type == "line") return BucketType::Line;
else if (type == "point") return BucketType::Point;
else if (type == "point") return BucketType::Icon;
else if (type == "text") return BucketType::Text;
else if (type == "raster") return BucketType::Raster;
else return BucketType::None;

2
include/llmr/style/class_description.hpp
View File

@@ -13,7 +13,7 @@ public:
BackgroundClass background;
std::map<std::string, FillClass> fill;
std::map<std::string, LineClass> line;
std::map<std::string, PointClass> point;
std::map<std::string, IconClass> icon;
std::map<std::string, TextClass> text;
std::map<std::string, RasterClass> raster;
};

4
include/llmr/style/properties.hpp
View File

@@ -60,7 +60,7 @@ struct FunctionProperty {
template <typename T> inline T evaluate(float z) const { return function(z, values); }
};
struct PointClass {
struct IconClass {
FunctionProperty enabled = true;
std::array<FunctionProperty, 2> translate = {{ 0, 0 }};
TranslateAnchor translateAnchor = TranslateAnchor::Map;
@@ -72,7 +72,7 @@ struct PointClass {
FunctionProperty blur = 0;
};
struct PointProperties {
struct IconProperties {
bool enabled = true;
std::array<float, 2> translate = {{ 0, 0 }};
TranslateAnchor translateAnchor = TranslateAnchor::Map;

2
include/llmr/style/style.hpp
View File

@@ -46,7 +46,7 @@ public:
BackgroundProperties background;
std::map<std::string, FillProperties> fills;
std::map<std::string, LineProperties> lines;
std::map<std::string, PointProperties> points;
std::map<std::string, IconProperties> icons;
std::map<std::string, TextProperties> texts;
std::map<std::string, RasterProperties> rasters;
} computed;

2
include/llmr/style/style_parser.hpp
View File

@@ -22,7 +22,7 @@ private:
void parseClass(const std::string& name, JSVal value, ClassDescription& class_desc, std::map<std::string, BucketDescription>& buckets, std::vector<LayerDescription>& layers);
FillClass parseFillClass(JSVal value);
LineClass parseLineClass(JSVal value);
PointClass parsePointClass(JSVal value);
IconClass parseIconClass(JSVal value);
TextClass parseTextClass(JSVal value);
BackgroundClass parseBackgroundClass(JSVal value);
RasterClass parseRasterClass(JSVal value);