fix console warnings related to luma API changes

visgl · Apr 8, 2019 · 316b3b2 · 316b3b2
1 parent 290696c
commit 316b3b2
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 100 deletions.
diff --git a/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-cell-layer.js b/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-cell-layer.js
@@ -109,21 +109,23 @@ export default class GPUGridCellLayer extends Layer {
     const gridOffsetLow = [fp64LowPart(gridOffset[0]), fp64LowPart(gridOffset[1])];
 
     maxCountBuffer.bind({target: GL.UNIFORM_BUFFER, index: AGGREGATION_DATA_UBO_INDEX});
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        cellSize,
-        extruded,
-        elevationScale,
-        coverage,
-        gridSize,
-        gridOrigin,
-        gridOriginLow,
-        gridOffset,
-        gridOffsetLow,
-        minColor,
-        maxColor
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          cellSize,
+          extruded,
+          elevationScale,
+          coverage,
+          gridSize,
+          gridOrigin,
+          gridOriginLow,
+          gridOffset,
+          gridOffsetLow,
+          minColor,
+          maxColor
+        })
+      )
+      .draw();
     maxCountBuffer.unbind({target: GL.UNIFORM_BUFFER, index: AGGREGATION_DATA_UBO_INDEX});
   }
 

diff --git a/modules/core/src/lib/attribute-manager.js b/modules/core/src/lib/attribute-manager.js
@@ -378,7 +378,7 @@ export default class AttributeManager {
       isIndexed: attribute.isIndexed || attribute.elements,
       size: (attribute.elements && 1) || attribute.size,
       value: attribute.value || null,
-      instanced: attribute.instanced || extraProps.instanced
+      divisor: attribute.instanced || extraProps.instanced ? 1 : attribute.divisor
     };
 
     if (forceNoAlloc) {

diff --git a/modules/core/src/lib/base-attribute.js b/modules/core/src/lib/base-attribute.js
@@ -71,7 +71,7 @@ export default class BaseAttribute {
             Object.assign({}, opts, {
               id: this.id,
               target: this.target,
-              type: this.type
+              accessor: {type: this.type}
             })
           );
         this.buffer.setData({data: value});

diff --git a/modules/layers/src/arc-layer/arc-layer.js b/modules/layers/src/arc-layer/arc-layer.js
@@ -128,13 +128,15 @@ export default class ArcLayer extends Layer {
 
     const widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        widthScale: widthScale * widthMultiplier,
-        widthMinPixels,
-        widthMaxPixels
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          widthScale: widthScale * widthMultiplier,
+          widthMinPixels,
+          widthMaxPixels
+        })
+      )
+      .draw();
   }
 
   _getModel(gl) {

diff --git a/modules/layers/src/bitmap-layer/bitmap-layer.js b/modules/layers/src/bitmap-layer/bitmap-layer.js
@@ -185,14 +185,16 @@ export default class BitmapLayer extends Layer {
     // // TODO fix zFighting
     // Render the image
     if (bitmapTexture && model) {
-      model.render(
-        Object.assign({}, uniforms, {
-          bitmapTexture,
-          desaturate,
-          transparentColor,
-          tintColor
-        })
-      );
+      model
+        .setUniforms(
+          Object.assign({}, uniforms, {
+            bitmapTexture,
+            desaturate,
+            transparentColor,
+            tintColor
+          })
+        )
+        .draw();
     }
   }
 

diff --git a/modules/layers/src/column-layer/column-layer.js b/modules/layers/src/column-layer/column-layer.js
@@ -154,16 +154,18 @@ export default class ColumnLayer extends Layer {
   draw({uniforms}) {
     const {elevationScale, extruded, offset, coverage, radius, angle} = this.props;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        radius,
-        angle: (angle / 180) * Math.PI,
-        offset,
-        extruded,
-        coverage,
-        elevationScale
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          radius,
+          angle: (angle / 180) * Math.PI,
+          offset,
+          extruded,
+          coverage,
+          elevationScale
+        })
+      )
+      .draw();
   }
 
   calculateInstancePositions64xyLow(attribute) {

diff --git a/modules/layers/src/column-layer/grid-cell-layer.js b/modules/layers/src/column-layer/grid-cell-layer.js
@@ -35,16 +35,18 @@ export default class GridCellLayer extends ColumnLayer {
   draw({uniforms}) {
     const {elevationScale, extruded, offset, coverage, cellSize, angle} = this.props;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        radius: cellSize / 2,
-        angle,
-        offset,
-        extruded,
-        coverage,
-        elevationScale
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          radius: cellSize / 2,
+          angle,
+          offset,
+          extruded,
+          coverage,
+          elevationScale
+        })
+      )
+      .draw();
   }
 }
 

diff --git a/modules/layers/src/icon-layer/icon-layer.js b/modules/layers/src/icon-layer/icon-layer.js
@@ -181,17 +181,19 @@ export default class IconLayer extends Layer {
 
     const iconsTexture = iconManager.getTexture();
     if (iconsTexture) {
-      this.state.model.render(
-        Object.assign({}, uniforms, {
-          iconsTexture,
-          iconsTextureDim: [iconsTexture.width, iconsTexture.height],
-          sizeScale:
-            sizeScale * (sizeUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1),
-          sizeMinPixels,
-          sizeMaxPixels,
-          billboard
-        })
-      );
+      this.state.model
+        .setUniforms(
+          Object.assign({}, uniforms, {
+            iconsTexture,
+            iconsTextureDim: [iconsTexture.width, iconsTexture.height],
+            sizeScale:
+              sizeScale * (sizeUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1),
+            sizeMinPixels,
+            sizeMaxPixels,
+            billboard
+          })
+        )
+        .draw();
     }
   }
 

diff --git a/modules/layers/src/line-layer/line-layer.js b/modules/layers/src/line-layer/line-layer.js
@@ -107,13 +107,15 @@ export default class LineLayer extends Layer {
 
     const widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        widthScale: widthScale * widthMultiplier,
-        widthMinPixels,
-        widthMaxPixels
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          widthScale: widthScale * widthMultiplier,
+          widthMinPixels,
+          widthMaxPixels
+        })
+      )
+      .draw();
   }
 
   _getModel(gl) {

diff --git a/modules/layers/src/path-layer/path-layer.js b/modules/layers/src/path-layer/path-layer.js
@@ -158,16 +158,18 @@ export default class PathLayer extends Layer {
 
     const widthMultiplier = widthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        jointType: Number(rounded),
-        alignMode: Number(dashJustified),
-        widthScale: widthScale * widthMultiplier,
-        miterLimit,
-        widthMinPixels,
-        widthMaxPixels
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          jointType: Number(rounded),
+          alignMode: Number(dashJustified),
+          widthScale: widthScale * widthMultiplier,
+          miterLimit,
+          widthMinPixels,
+          widthMaxPixels
+        })
+      )
+      .draw();
   }
 
   _getModel(gl) {

diff --git a/modules/layers/src/point-cloud-layer/point-cloud-layer.js b/modules/layers/src/point-cloud-layer/point-cloud-layer.js
@@ -99,11 +99,13 @@ export default class PointCloudLayer extends Layer {
 
     const sizeMultiplier = sizeUnits === 'meters' ? viewport.distanceScales.pixelsPerMeter[2] : 1;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        radiusPixels: pointSize * sizeMultiplier
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          radiusPixels: pointSize * sizeMultiplier
+        })
+      )
+      .draw();
   }
 
   _getModel(gl) {

diff --git a/modules/layers/src/scatterplot-layer/scatterplot-layer.js b/modules/layers/src/scatterplot-layer/scatterplot-layer.js
@@ -130,18 +130,20 @@ export default class ScatterplotLayer extends Layer {
     const widthMultiplier =
       lineWidthUnits === 'pixels' ? viewport.distanceScales.metersPerPixel[2] : 1;
 
-    this.state.model.render(
-      Object.assign({}, uniforms, {
-        stroked: stroked ? 1 : 0,
-        filled,
-        radiusScale,
-        radiusMinPixels,
-        radiusMaxPixels,
-        lineWidthScale: lineWidthScale * widthMultiplier,
-        lineWidthMinPixels,
-        lineWidthMaxPixels
-      })
-    );
+    this.state.model
+      .setUniforms(
+        Object.assign({}, uniforms, {
+          stroked: stroked ? 1 : 0,
+          filled,
+          radiusScale,
+          radiusMinPixels,
+          radiusMaxPixels,
+          lineWidthScale: lineWidthScale * widthMultiplier,
+          lineWidthMinPixels,
+          lineWidthMaxPixels
+        })
+      )
+      .draw();
   }
 
   _getModel(gl) {

diff --git a/modules/layers/src/solid-polygon-layer/solid-polygon-layer.js b/modules/layers/src/solid-polygon-layer/solid-polygon-layer.js
@@ -213,17 +213,17 @@ export default class SolidPolygonLayer extends Layer {
       sideModel.setUniforms(renderUniforms);
       if (wireframe) {
         sideModel.setDrawMode(GL.LINE_STRIP);
-        sideModel.render({isWireframe: true});
+        sideModel.setUniforms({isWireframe: true}).draw();
       }
       if (filled) {
         sideModel.setDrawMode(GL.TRIANGLE_FAN);
-        sideModel.render({isWireframe: false});
+        sideModel.setUniforms({isWireframe: false}).draw();
       }
     }
 
     if (topModel) {
       topModel.setVertexCount(polygonTesselator.get('indices').length);
-      topModel.render(renderUniforms);
+      topModel.setUniforms(renderUniforms).draw();
     }
   }