diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-17 14:39:24 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-17 14:39:24 -0700 |
commit | 63bdc0c4506d57c41f906c14ac8b0cf369ce39c1 (patch) | |
tree | 40e5cc87247d3c3f560d366ca9ff1fbbf991c7bb | |
parent | 84685bfe567712c4a40892079b6c9b40473ea050 (diff) | |
download | qtlocation-mapboxgl-63bdc0c4506d57c41f906c14ac8b0cf369ce39c1.tar.gz |
Update make_property_setters.hpp.ejs
-rw-r--r-- | scripts/generate-style-code.js | 4 | ||||
-rw-r--r-- | src/mbgl/style/conversion/make_property_setters.hpp.ejs | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index fe9a1a906b..443f0c7cc9 100644 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -186,8 +186,8 @@ for (const layer of layers) { writeIfModified(`src/mbgl/style/layers/${layerFileName}_layer_properties.cpp`, propertiesCpp(layer)); } -const propertySettersHpp = ejs.compile(fs.readFileSync('include/mbgl/style/conversion/make_property_setters.hpp.ejs', 'utf8'), {strict: true}); -writeIfModified('include/mbgl/style/conversion/make_property_setters.hpp', propertySettersHpp({layers: layers})); +const propertySettersHpp = ejs.compile(fs.readFileSync('src/mbgl/style/conversion/make_property_setters.hpp.ejs', 'utf8'), {strict: true}); +writeIfModified('src/mbgl/style/conversion/make_property_setters.hpp', propertySettersHpp({layers: layers})); // Light const lightProperties = Object.keys(spec[`light`]).reduce((memo, name) => { diff --git a/src/mbgl/style/conversion/make_property_setters.hpp.ejs b/src/mbgl/style/conversion/make_property_setters.hpp.ejs index 19c9f70538..2975cb19f2 100644 --- a/src/mbgl/style/conversion/make_property_setters.hpp.ejs +++ b/src/mbgl/style/conversion/make_property_setters.hpp.ejs @@ -14,29 +14,27 @@ namespace mbgl { namespace style { namespace conversion { -template <class V> -auto makeLayoutPropertySetters() { - std::unordered_map<std::string, PropertySetter<V>> result; +inline auto makeLayoutPropertySetters() { + std::unordered_map<std::string, PropertySetter> result; - result["visibility"] = &setVisibility<V>; + result["visibility"] = &setVisibility; <% for (const layer of locals.layers) { -%> <% for (const property of layer.layoutProperties) { -%> - result["<%- property.name %>"] = &setProperty<V, <%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; + result["<%- property.name %>"] = &setProperty<<%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; <% } -%> <% } -%> return result; } -template <class V> -auto makePaintPropertySetters() { - std::unordered_map<std::string, PropertySetter<V>> result; +inline auto makePaintPropertySetters() { + std::unordered_map<std::string, PropertySetter> result; <% for (const layer of locals.layers) { -%> <% for (const property of layer.paintProperties) { -%> - result["<%- property.name %>"] = &setProperty<V, <%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; - result["<%- property.name %>-transition"] = &setTransition<V, <%- camelize(layer.type) %>Layer, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition>; + result["<%- property.name %>"] = &setProperty<<%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; + result["<%- property.name %>-transition"] = &setTransition<<%- camelize(layer.type) %>Layer, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition>; <% } -%> <% } -%> |