diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-26 12:53:32 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 17:14:01 -0700 |
| commit | 0e57d10d77e555a9229f7d522d83f87df7d5180d (patch) | |
| tree | 2a3c3b0dd4ed6edf385ba8d390d919e469b7a96a /include/mbgl | |
| parent | a4c82b8a3b5e48f3bbccf32be80d45ca78d51515 (diff) | |
| download | qtlocation-mapboxgl-0e57d10d77e555a9229f7d522d83f87df7d5180d.tar.gz | |
[core] Modern C++ bindings for OpenGL
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/util/color.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/util/range.hpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp index 4be380fde3..7693ce636d 100644 --- a/include/mbgl/util/color.hpp +++ b/include/mbgl/util/color.hpp @@ -17,6 +17,10 @@ public: static constexpr Color black() { return { 0.0f, 0.0f, 0.0f, 1.0f }; }; static constexpr Color white() { return { 1.0f, 1.0f, 1.0f, 1.0f }; }; + static constexpr Color red() { return { 1.0f, 0.0f, 0.0f, 1.0f }; }; + static constexpr Color green() { return { 0.0f, 1.0f, 0.0f, 1.0f }; }; + static constexpr Color blue() { return { 0.0f, 0.0f, 1.0f, 1.0f }; }; + static optional<Color> parse(const std::string&); }; diff --git a/include/mbgl/util/range.hpp b/include/mbgl/util/range.hpp index 8da2dd45bb..f7fa92eb8b 100644 --- a/include/mbgl/util/range.hpp +++ b/include/mbgl/util/range.hpp @@ -5,7 +5,7 @@ namespace mbgl { template <class T> class Range { public: - Range(const T& min_, const T& max_) + constexpr Range(const T& min_, const T& max_) : min(min_), max(max_) {} T min; |