diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-05-31 15:15:12 +0200 |
---|---|---|
committer | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-08-31 13:08:47 -0700 |
commit | f97ba60da46445b15fcdea9bd6c1d7ceb63138e2 (patch) | |
tree | f91f02dab335ea49cf56711bcd32a2a249c27c39 /src/mbgl | |
parent | abc5043339d1aa8eb25e449248ae5a95e00835a3 (diff) | |
download | qtlocation-mapboxgl-f97ba60da46445b15fcdea9bd6c1d7ceb63138e2.tar.gz |
[core] rename gl::Attribute to gl::Attribute to remove overloaded naming
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/gl/attribute.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/programs/attributes.hpp | 44 | ||||
-rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_property_binder.hpp | 14 |
4 files changed, 33 insertions, 33 deletions
diff --git a/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp index 6bb38f6102..de95be0733 100644 --- a/src/mbgl/gl/attribute.hpp +++ b/src/mbgl/gl/attribute.hpp @@ -46,12 +46,12 @@ public: using AttributeBindingArray = std::vector<optional<AttributeBinding>>; /* - gl::Attribute<T,N> manages the binding of a vertex buffer to a GL program attribute. + gl::AttributeType<T,N> manages the binding of a vertex buffer to a GL program attribute. - T is the underlying primitive type (exposed as Attribute<T,N>::ValueType) - N is the number of components in the attribute declared in the shader (exposed as Attribute<T,N>::Dimensions) */ template <class T, std::size_t N> -class Attribute { +class AttributeType { public: using ValueType = T; static constexpr size_t Dimensions = N; @@ -96,7 +96,7 @@ public: #define MBGL_DEFINE_ATTRIBUTE(type_, n_, name_) \ struct name_ { \ static auto name() { return #name_; } \ - using Type = ::mbgl::gl::Attribute<type_, n_>; \ + using Type = ::mbgl::gl::AttributeType<type_, n_>; \ } namespace detail { diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp index c677c84d5d..f1f1bdaa3f 100644 --- a/src/mbgl/programs/attributes.hpp +++ b/src/mbgl/programs/attributes.hpp @@ -35,116 +35,116 @@ MBGL_DEFINE_ATTRIBUTE(uint8_t, 2, a_placed); template <typename T, std::size_t N> struct a_data { static auto name() { return "a_data"; } - using Type = gl::Attribute<T, N>; + using Type = gl::AttributeType<T, N>; }; struct a_size { static auto name() { return "a_size"; } - using Type = gl::Attribute<uint16_t, 3>; + using Type = gl::AttributeType<uint16_t, 3>; }; template <std::size_t N> struct a_offset { static auto name() { return "a_offset"; } - using Type = gl::Attribute<int16_t, N>; + using Type = gl::AttributeType<int16_t, N>; }; // Paint attributes struct a_color { static auto name() { return "a_color"; } - using Type = gl::Attribute<float, 2>; + using Type = gl::AttributeType<float, 2>; }; struct a_fill_color { static auto name() { return "a_fill_color"; } - using Type = gl::Attribute<float, 2>; + using Type = gl::AttributeType<float, 2>; }; struct a_halo_color { static auto name() { return "a_halo_color"; } - using Type = gl::Attribute<float, 2>; + using Type = gl::AttributeType<float, 2>; }; struct a_stroke_color { static auto name() { return "a_stroke_color"; } - using Type = gl::Attribute<float, 2>; + using Type = gl::AttributeType<float, 2>; }; struct a_outline_color { static auto name() { return "a_outline_color"; } - using Type = gl::Attribute<float, 2>; + using Type = gl::AttributeType<float, 2>; }; struct a_opacity { static auto name() { return "a_opacity"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_stroke_opacity { static auto name() { return "a_stroke_opacity"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_blur { static auto name() { return "a_blur"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_radius { static auto name() { return "a_radius"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_width { static auto name() { return "a_width"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_floorwidth { static auto name() { return "a_floorwidth"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_height { static auto name() { return "a_height"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_base { static auto name() { return "a_base"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_gapwidth { static auto name() { return "a_gapwidth"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_stroke_width { static auto name() { return "a_stroke_width"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; template <> struct a_offset<1> { static auto name() { return "a_offset"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_halo_width { static auto name() { return "a_halo_width"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_halo_blur { static auto name() { return "a_halo_blur"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; struct a_weight { static auto name() { return "a_weight"; } - using Type = gl::Attribute<float, 1>; + using Type = gl::AttributeType<float, 1>; }; } // namespace attributes diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 651f12828f..a1a4621b62 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -185,7 +185,7 @@ public: class SourceFunctionSymbolSizeBinder final : public SymbolSizeBinder { public: - using Vertex = gl::detail::Vertex<gl::Attribute<uint16_t, 1>>; + using Vertex = gl::detail::Vertex<gl::AttributeType<uint16_t, 1>>; using VertexVector = gl::VertexVector<Vertex>; using VertexBuffer = gl::VertexBuffer<Vertex>; diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index 6a0f5e3a46..82c36399a9 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -19,7 +19,7 @@ namespace mbgl { being zoomed. */ template <class A> -using ZoomInterpolatedAttributeType = gl::Attribute<typename A::ValueType, A::Dimensions * 2>; +using ZoomInterpolatedAttributeType = gl::AttributeType<typename A::ValueType, A::Dimensions * 2>; inline std::array<float, 1> attributeValue(float v) { return {{ v }}; @@ -122,7 +122,7 @@ public: using BaseAttributeValue = typename BaseAttribute::Value; using BaseVertex = gl::detail::Vertex<BaseAttribute>; - using Attribute = ZoomInterpolatedAttributeType<A>; + using AttributeType = ZoomInterpolatedAttributeType<A>; SourceFunctionPaintPropertyBinder(style::PropertyExpression<T> expression_, T defaultValue_) : expression(std::move(expression_)), @@ -146,7 +146,7 @@ public: if (currentValue.isConstant()) { return {}; } else { - return Attribute::binding(*vertexBuffer, 0, BaseAttribute::Dimensions); + return AttributeType::binding(*vertexBuffer, 0, BaseAttribute::Dimensions); } } @@ -174,9 +174,9 @@ template <class T, class A> class CompositeFunctionPaintPropertyBinder : public PaintPropertyBinder<T, A> { public: - using Attribute = ZoomInterpolatedAttributeType<A>; - using AttributeValue = typename Attribute::Value; - using Vertex = gl::detail::Vertex<Attribute>; + using AttributeType = ZoomInterpolatedAttributeType<A>; + using AttributeValue = typename AttributeType::Value; + using Vertex = gl::detail::Vertex<AttributeType>; CompositeFunctionPaintPropertyBinder(style::PropertyExpression<T> expression_, float zoom, T defaultValue_) : expression(std::move(expression_)), @@ -204,7 +204,7 @@ public: if (currentValue.isConstant()) { return {}; } else { - return Attribute::binding(*vertexBuffer, 0); + return AttributeType::binding(*vertexBuffer, 0); } } |