From 7b05606464ac4d57b59b64015629e9578cbebac2 Mon Sep 17 00:00:00 2001 From: Lauren Budorick Date: Fri, 16 Jun 2017 16:21:16 -0700 Subject: [core] add DataDrivenPaintProperty uniform template class to generation script (#9297) --- scripts/generate-style-code.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index c169c4ecd5..b1d0ed28ec 100644 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -53,7 +53,7 @@ global.evaluatedType = function (property) { } }; -function attributeType(property, type) { +function attributeUniformType(property, type) { const attributeNameExceptions = { 'text-opacity': 'opacity', 'icon-opacity': 'opacity', @@ -64,11 +64,12 @@ function attributeType(property, type) { 'text-halo-blur': 'halo_blur', 'icon-halo-blur': 'halo_blur', 'text-halo-width': 'halo_width', - 'icon-halo-width': 'halo_width' + 'icon-halo-width': 'halo_width', + 'line-gap-width': 'gapwidth' } const name = attributeNameExceptions[property.name] || property.name.replace(type + '-', '').replace(/-/g, '_'); - return `attributes::a_${name}${name === 'offset' ? '<1>' : ''}`; + return `attributes::a_${name}${name === 'offset' ? '<1>' : ''}, uniforms::u_${name}`; } global.layoutPropertyType = function (property) { @@ -81,7 +82,7 @@ global.layoutPropertyType = function (property) { global.paintPropertyType = function (property, type) { if (isDataDriven(property)) { - return `DataDrivenPaintProperty<${evaluatedType(property)}, ${attributeType(property, type)}>`; + return `DataDrivenPaintProperty<${evaluatedType(property)}, ${attributeUniformType(property, type)}>`; } else if (/-pattern$/.test(property.name) || property.name === 'line-dasharray') { return `CrossFadedPaintProperty<${evaluatedType(property)}>`; } else { -- cgit v1.2.1