diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-02 15:44:39 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-02 15:44:39 -0700 |
commit | e1a58565c88a80e5b68181e69fd3a8b4bfe3e85c (patch) | |
tree | 59d72e2a3d8033554e8730d3b032384142b24ec4 /src | |
parent | c902f9098b331302aaa1baac77d1575db624a132 (diff) | |
download | qtlocation-mapboxgl-e1a58565c88a80e5b68181e69fd3a8b4bfe3e85c.tar.gz |
[core] Move RenderData alongside RenderItem
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/renderer/render_item.hpp | 38 | ||||
-rw-r--r-- | src/mbgl/style/render_item.hpp | 24 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/style/style.hpp | 11 |
5 files changed, 42 insertions, 37 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index f040fee67f..25627a8d7a 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -5,18 +5,17 @@ #include <mbgl/tile/tile_id.hpp> #include <mbgl/renderer/frame_history.hpp> +#include <mbgl/renderer/render_item.hpp> #include <mbgl/renderer/bucket.hpp> #include <mbgl/geometry/vao.hpp> #include <mbgl/geometry/static_vertex_buffer.hpp> #include <mbgl/gl/gl_config.hpp> +#include <mbgl/gl/gl.hpp> -#include <mbgl/style/render_item.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/gl/gl.hpp> - #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/util/constants.hpp> diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp new file mode 100644 index 0000000000..6c97b66bd1 --- /dev/null +++ b/src/mbgl/renderer/render_item.hpp @@ -0,0 +1,38 @@ +#pragma once + +#include <mbgl/util/color.hpp> + +#include <set> +#include <vector> + +namespace mbgl { + +class Tile; +class Bucket; + +namespace style { +class Layer; +class Source; +} + +class RenderItem { +public: + RenderItem(const style::Layer& layer_, + const Tile* tile_ = nullptr, + Bucket* bucket_ = nullptr) + : tile(tile_), bucket(bucket_), layer(layer_) { + } + + const Tile* const tile; + Bucket* const bucket; + const style::Layer& layer; +}; + +class RenderData { +public: + Color backgroundColor = {{ 0, 0, 0, 0 }}; + std::set<style::Source*> sources; + std::vector<RenderItem> order; +}; + +} // namespace mbgl diff --git a/src/mbgl/style/render_item.hpp b/src/mbgl/style/render_item.hpp deleted file mode 100644 index da59591c36..0000000000 --- a/src/mbgl/style/render_item.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -namespace mbgl { - -class Tile; -class Bucket; - -namespace style { -class Layer; -} - -struct RenderItem { - inline RenderItem(const style::Layer& layer_, - const Tile* tile_ = nullptr, - Bucket* bucket_ = nullptr) - : tile(tile_), bucket(bucket_), layer(layer_) { - } - - const Tile* const tile; - Bucket* const bucket; - const style::Layer& layer; -}; - -} // namespace mbgl diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 136c98df03..b86845154c 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -18,6 +18,7 @@ #include <mbgl/style/update_parameters.hpp> #include <mbgl/style/cascade_parameters.hpp> #include <mbgl/style/calculation_parameters.hpp> +#include <mbgl/renderer/render_item.hpp> #include <mbgl/geometry/glyph_atlas.hpp> #include <mbgl/geometry/line_atlas.hpp> #include <mbgl/util/constants.hpp> diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 49af674336..a679681f41 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -1,8 +1,6 @@ #pragma once -#include <mbgl/style/render_item.hpp> #include <mbgl/style/transition_options.hpp> - #include <mbgl/style/observer.hpp> #include <mbgl/style/source_observer.hpp> #include <mbgl/text/glyph_store_observer.hpp> @@ -15,12 +13,10 @@ #include <mbgl/util/worker.hpp> #include <mbgl/util/optional.hpp> #include <mbgl/util/feature.hpp> -#include <mbgl/util/color.hpp> #include <cstdint> #include <string> #include <vector> -#include <set> namespace mbgl { @@ -28,12 +24,7 @@ class FileSource; class GlyphAtlas; class SpriteAtlas; class LineAtlas; - -struct RenderData { - Color backgroundColor = {{ 0, 0, 0, 0 }}; - std::set<style::Source*> sources; - std::vector<RenderItem> order; -}; +class RenderData; namespace style { |