add text rendering code

This commit is contained in:
Konstantin Käfer
2014-03-21 17:36:29 +01:00
parent a7b9b96d4d
commit ea6b24d02d
13 changed files with 241 additions and 35 deletions

View File

@@ -268,24 +268,35 @@ std::string StyleParser::parseString(JSVal value) {
}
Color StyleParser::parseColor(JSVal value) {
if (!value.IsString()) {
if (value.IsArray()) {
// [ r, g, b, a] array
if (value.Size() != 4) {
throw Style::exception("color array must have four elements");
}
JSVal r = value[(rapidjson::SizeType)0], g = value[1], b = value[2], a = value[3];
if (!r.IsNumber() || !g.IsNumber() || !b.IsNumber() || !a.IsNumber()) {
throw Style::exception("color values must be numbers");
}
return {{static_cast<float>(r.GetDouble() / 255),
static_cast<float>(g.GetDouble() / 255),
static_cast<float>(b.GetDouble() / 255),
static_cast<float>(a.GetDouble())}};
} else if (!value.IsString()) {
throw Style::exception("color value must be a string");
}
const std::string str { value.GetString(), value.GetStringLength() };
const std::string str{value.GetString(), value.GetStringLength()};
auto it = constants.find(str);
if (it != constants.end()) {
return parseColor(*it->second);
} else {
CSSColorParser::Color css_color = CSSColorParser::parse(str);
return {{
(float)css_color.r / 255,
(float)css_color.g / 255,
(float)css_color.b / 255,
css_color.a
}
};
return {{(float)css_color.r / 255, (float)css_color.g / 255,
(float)css_color.b / 255, css_color.a}};
}
}
@@ -477,10 +488,26 @@ PointClass StyleParser::parsePointClass(JSVal value) {
TextClass StyleParser::parseTextClass(JSVal value) {
TextClass klass;
if (value.HasMember("hidden")) {
klass.hidden = parseBoolFunction(value["hidden"]);
}
if (value.HasMember("color")) {
klass.color = parseColor(value["color"]);
}
if (value.HasMember("stroke")) {
klass.halo = parseColor(value["stroke"]);
}
if (value.HasMember("strokeWidth")) {
klass.haloRadius = parseFloatFunction(value["strokeWidth"]);
}
if (value.HasMember("size")) {
klass.size = parseFloatFunction(value["size"]);
}
return klass;
}