[core, node] Implement setPaintProperty for color properties (#5380)
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
#include <mbgl/util/image.hpp>
|
||||
|
||||
#include <array>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include <mbgl/util/optional.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -14,6 +16,8 @@ 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 optional<Color> parse(const std::string&);
|
||||
};
|
||||
|
||||
inline bool operator==(const Color& colorA, const Color& colorB) {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
"express": "^4.11.1",
|
||||
"mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#59e998295d548f208ee3ec10cdd21ff2630e2079",
|
||||
"mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#194fc55b6a7dd54c1e2cf2dd9048fbb5e836716d",
|
||||
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#05d8865cf38920d5d15de0e410475514d6edace0",
|
||||
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#3a6baea2f364410e6d0873b71babfe0484870a72",
|
||||
"node-gyp": "^3.3.1",
|
||||
"request": "^2.72.0",
|
||||
"tape": "^4.5.1"
|
||||
|
||||
@@ -65,8 +65,18 @@ struct ValueConverter<T, std::enable_if_t<std::is_enum<T>::value>> {
|
||||
template <>
|
||||
struct ValueConverter<mbgl::Color> {
|
||||
mbgl::optional<mbgl::style::PropertyValue<mbgl::Color>> operator()(const v8::Local<v8::Value>& value) const {
|
||||
(void)value;
|
||||
return {};
|
||||
if (!value->IsString()) {
|
||||
Nan::ThrowTypeError("string required");
|
||||
return {};
|
||||
}
|
||||
|
||||
mbgl::optional<mbgl::Color> result = mbgl::Color::parse(*Nan::Utf8String(value));
|
||||
if (!result) {
|
||||
Nan::ThrowTypeError("invalid color");
|
||||
return {};
|
||||
}
|
||||
|
||||
return { *result };
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
|
||||
#include <csscolorparser/csscolorparser.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace style {
|
||||
|
||||
@@ -44,15 +42,13 @@ optional<Color> parseConstant(const char* name, const JSValue& value) {
|
||||
return {};
|
||||
}
|
||||
|
||||
CSSColorParser::Color css_color = CSSColorParser::parse({ value.GetString(), value.GetStringLength() });
|
||||
optional<Color> result = Color::parse({ value.GetString(), value.GetStringLength() });
|
||||
if (!result) {
|
||||
Log::Warning(Event::ParseStyle, "value of '%s' must be a valid color", name);
|
||||
return {};
|
||||
}
|
||||
|
||||
// Premultiply the color.
|
||||
const float factor = css_color.a / 255;
|
||||
|
||||
return Color{ (float)css_color.r * factor,
|
||||
(float)css_color.g * factor,
|
||||
(float)css_color.b * factor,
|
||||
css_color.a };
|
||||
return result;
|
||||
}
|
||||
|
||||
template <>
|
||||
|
||||
20
src/mbgl/util/color.cpp
Normal file
20
src/mbgl/util/color.cpp
Normal file
@@ -0,0 +1,20 @@
|
||||
#include <mbgl/util/color.hpp>
|
||||
|
||||
#include <csscolorparser/csscolorparser.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
optional<Color> Color::parse(const std::string& s) {
|
||||
CSSColorParser::Color css_color = CSSColorParser::parse(s);
|
||||
|
||||
// Premultiply the color.
|
||||
const float factor = css_color.a / 255;
|
||||
return {{
|
||||
css_color.r * factor,
|
||||
css_color.g * factor,
|
||||
css_color.b * factor,
|
||||
css_color.a
|
||||
}};
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
Reference in New Issue
Block a user