diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-06 16:05:19 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-09 10:58:11 -0700 |
commit | 691756d7dd31c4be789840a6c9881d299176be3c (patch) | |
tree | 375f96be4a186865e483799c2eb86d2b850c3761 /src/mbgl | |
parent | fc3802eddb679c040b7faaac0dc1b096cbc940a7 (diff) | |
download | qtlocation-mapboxgl-691756d7dd31c4be789840a6c9881d299176be3c.tar.gz |
Move ClipID to clip_id.hpp/cpp
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/map/map.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/tile.hpp | 16 | ||||
-rw-r--r-- | src/mbgl/renderer/painter.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_clipping.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/util/clip_id.cpp (renamed from src/mbgl/util/clip_ids.cpp) | 2 | ||||
-rw-r--r-- | src/mbgl/util/clip_id.hpp (renamed from src/mbgl/util/clip_ids.hpp) | 15 |
6 files changed, 20 insertions, 19 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 8697523ac1..5e046766e6 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -8,7 +8,7 @@ #include <mbgl/map/annotation.hpp> #include <mbgl/map/sprite.hpp> #include <mbgl/util/math.hpp> -#include <mbgl/util/clip_ids.hpp> +#include <mbgl/util/clip_id.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/uv_detail.hpp> diff --git a/src/mbgl/map/tile.hpp b/src/mbgl/map/tile.hpp index d9ab5f1c6c..996433b5d9 100644 --- a/src/mbgl/map/tile.hpp +++ b/src/mbgl/map/tile.hpp @@ -4,28 +4,14 @@ #include <mbgl/util/mat4.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/ptr.hpp> +#include <mbgl/util/clip_id.hpp> #include <mbgl/map/tile_id.hpp> -#include <bitset> -#include <string> - namespace mbgl { class TileData; struct box; -struct ClipID { - inline ClipID() {} - inline ClipID(const std::string &mask_, const std::string &reference_) : mask(mask_), reference(reference_) {} - - std::bitset<8> mask; - std::bitset<8> reference; - - inline bool operator==(const ClipID &other) const { - return mask == other.mask && reference == other.reference; - } -}; - class Tile : private util::noncopyable { public: explicit Tile(const TileID& id_) diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index c05aab0ae5..cafd614244 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -5,7 +5,7 @@ #include <mbgl/style/style_bucket.hpp> #include <mbgl/util/std.hpp> #include <mbgl/util/string.hpp> -#include <mbgl/util/clip_ids.hpp> +#include <mbgl/util/clip_id.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/mat3.hpp> #include <mbgl/geometry/sprite_atlas.hpp> diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp index 8b97bb5b69..3a981ed1ec 100644 --- a/src/mbgl/renderer/painter_clipping.cpp +++ b/src/mbgl/renderer/painter_clipping.cpp @@ -3,7 +3,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/map/tile.hpp> #include <mbgl/map/source.hpp> -#include <mbgl/util/clip_ids.hpp> +#include <mbgl/util/clip_id.hpp> using namespace mbgl; diff --git a/src/mbgl/util/clip_ids.cpp b/src/mbgl/util/clip_id.cpp index 42a1627b6e..be359c18c3 100644 --- a/src/mbgl/util/clip_ids.cpp +++ b/src/mbgl/util/clip_id.cpp @@ -1,4 +1,4 @@ -#include <mbgl/util/clip_ids.hpp> +#include <mbgl/util/clip_id.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/util/math.hpp> diff --git a/src/mbgl/util/clip_ids.hpp b/src/mbgl/util/clip_id.hpp index 154003f280..3940e60524 100644 --- a/src/mbgl/util/clip_ids.hpp +++ b/src/mbgl/util/clip_id.hpp @@ -3,6 +3,8 @@ #include <mbgl/map/tile_id.hpp> +#include <bitset> +#include <string> #include <list> #include <set> #include <vector> @@ -12,6 +14,19 @@ namespace mbgl { class Tile; +class TileID; + +struct ClipID { + inline ClipID() {} + inline ClipID(const std::string &mask_, const std::string &reference_) : mask(mask_), reference(reference_) {} + + std::bitset<8> mask; + std::bitset<8> reference; + + inline bool operator==(const ClipID &other) const { + return mask == other.mask && reference == other.reference; + } +}; class ClipIDGenerator { private: |