Rewrite ProgramConfiguration to work more like gl-native

* Expand #pragmas to #ifndefs early on. This is written in such a way that it can be reused by gl-native's generate-shaders.js. * Binder interface for paint properties, with a concrete implementation for each binding strategy. * Always use floats for paint property attributes, without a multiplication factor. (Fixes #4438) * When binding composite functions, interpolate between two stop values only: zoom and zoom + 1.
mapbox · Jul 5, 2017 · a3b43f6 · a3b43f6
1 parent 8a16126
commit a3b43f6
Show file tree

Hide file tree

Showing 13 changed files with 334 additions and 359 deletions.
diff --git a/src/data/array_group.js b/src/data/array_group.js
@@ -140,7 +140,6 @@ class ArrayGroup {
                 layerData.paintVertexArray,
                 layerData.paintPropertyStatistics,
                 this.layoutVertexArray.length,
-                this.globalProperties,
                 featureProperties);
         }
     }

diff --git a/src/data/bucket/circle_bucket.js b/src/data/bucket/circle_bucket.js
@@ -15,13 +15,13 @@ const circleInterface = {
     elementArrayType: createElementArrayType(),
 
     paintAttributes: [
-        {property: 'circle-color',          type: 'Uint8'},
-        {property: 'circle-radius',         type: 'Uint16', multiplier: 10},
-        {property: 'circle-blur',           type: 'Uint16', multiplier: 10},
-        {property: 'circle-opacity',        type: 'Uint8',  multiplier: 255},
-        {property: 'circle-stroke-color',   type: 'Uint8'},
-        {property: 'circle-stroke-width',   type: 'Uint16', multiplier: 10},
-        {property: 'circle-stroke-opacity', type: 'Uint8',  multiplier: 255}
+        {property: 'circle-color'},
+        {property: 'circle-radius'},
+        {property: 'circle-blur'},
+        {property: 'circle-opacity'},
+        {property: 'circle-stroke-color'},
+        {property: 'circle-stroke-width'},
+        {property: 'circle-stroke-opacity'}
     ]
 };
 

diff --git a/src/data/bucket/fill_bucket.js b/src/data/bucket/fill_bucket.js
@@ -19,9 +19,9 @@ const fillInterface = {
     elementArrayType2: createElementArrayType(2),
 
     paintAttributes: [
-        {property: 'fill-color',         type: 'Uint8'},
-        {property: 'fill-outline-color', type: 'Uint8'},
-        {property: 'fill-opacity',       type: 'Uint8', multiplier: 255}
+        {property: 'fill-color'},
+        {property: 'fill-outline-color'},
+        {property: 'fill-opacity'}
     ]
 };
 

diff --git a/src/data/bucket/fill_extrusion_bucket.js b/src/data/bucket/fill_extrusion_bucket.js
@@ -21,9 +21,9 @@ const fillExtrusionInterface = {
     elementArrayType: createElementArrayType(3),
 
     paintAttributes: [
-        {property: 'fill-extrusion-base',   type: 'Uint16'},
-        {property: 'fill-extrusion-height', type: 'Uint16'},
-        {property: 'fill-extrusion-color',  type: 'Uint8'}
+        {property: 'fill-extrusion-base'},
+        {property: 'fill-extrusion-height'},
+        {property: 'fill-extrusion-color'}
     ]
 };
 

diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
@@ -50,13 +50,13 @@ const lineInterface = {
         {name: 'a_data', components: 4, type: 'Uint8'}
     ],
     paintAttributes: [
-        {property: 'line-color', type: 'Uint8'},
-        {property: 'line-blur', multiplier: 10, type: 'Uint8'},
-        {property: 'line-opacity', multiplier: 10, type: 'Uint8'},
-        {property: 'line-gap-width', multiplier: 10, type: 'Uint8', name: 'a_gapwidth'},
-        {property: 'line-offset', multiplier: 1, type: 'Int8'},
-        {property: 'line-width', multiplier: 10, type: 'Uint8', name: 'a_width'},
-        {property: 'line-width', multiplier: 10, type: 'Uint8', name: 'a_floorwidth', useIntegerZoom: true},
+        {property: 'line-color'},
+        {property: 'line-blur'},
+        {property: 'line-opacity'},
+        {property: 'line-gap-width', name: 'gapwidth'},
+        {property: 'line-offset'},
+        {property: 'line-width'},
+        {property: 'line-width', name: 'floorwidth', useIntegerZoom: true},
     ],
     elementArrayType: createElementArrayType()
 };

diff --git a/src/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js
@@ -92,23 +92,23 @@ const symbolInterfaces = {
         dynamicLayoutAttributes: dynamicLayoutAttributes,
         elementArrayType: elementArrayType,
         paintAttributes: [
-            {name: 'a_fill_color', property: 'text-color', type: 'Uint8'},
-            {name: 'a_halo_color', property: 'text-halo-color', type: 'Uint8'},
-            {name: 'a_halo_width', property: 'text-halo-width', type: 'Uint16', multiplier: 10},
-            {name: 'a_halo_blur', property: 'text-halo-blur', type: 'Uint16', multiplier: 10},
-            {name: 'a_opacity', property: 'text-opacity', type: 'Uint8', multiplier: 255}
+            {property: 'text-color', name: 'fill_color'},
+            {property: 'text-halo-color', name: 'halo_color'},
+            {property: 'text-halo-width', name: 'halo_width'},
+            {property: 'text-halo-blur', name: 'halo_blur'},
+            {property: 'text-opacity', name: 'opacity'}
         ]
     },
     icon: {
         layoutAttributes: layoutAttributes,
         dynamicLayoutAttributes: dynamicLayoutAttributes,
         elementArrayType: elementArrayType,
         paintAttributes: [
-            {name: 'a_fill_color', property: 'icon-color', type: 'Uint8'},
-            {name: 'a_halo_color', property: 'icon-halo-color', type: 'Uint8'},
-            {name: 'a_halo_width', property: 'icon-halo-width', type: 'Uint16', multiplier: 10},
-            {name: 'a_halo_blur', property: 'icon-halo-blur', type: 'Uint16', multiplier: 10},
-            {name: 'a_opacity', property: 'icon-opacity', type: 'Uint8', multiplier: 255}
+            {property: 'icon-color', name: 'fill_color'},
+            {property: 'icon-halo-color', name: 'halo_color'},
+            {property: 'icon-halo-width', name: 'halo_width'},
+            {property: 'icon-halo-blur', name: 'halo_blur'},
+            {property: 'icon-opacity', name: 'opacity'}
         ]
     },
     collisionBox: { // used to render collision boxes for debugging purposes