Fixes to drawlayers (visgl#1002)

ibgreen · web-flow · commit 9e676d6ecb56 · 2017-10-09T17:37:02.000-07:00
diff --git a/examples/layer-browser/package.json b/examples/layer-browser/package.json
@@ -1,14 +1,14 @@
 {
   "scripts": {
     "start": "webpack-dev-server --progress --hot --open",
-    "start-local": "webpack-dev-server --env.local --progress --hot --open",
-    "start-es6": "webpack-dev-server --env.es6 --progress --hot --open"
+    "start-local": "webpack-dev-server --env.es6 --progress --hot --open",
+    "start-local-es5": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "deck.gl": ">=4.2.0-alpha.10",
     "colorbrewer": "^1.0.0",
+    "deck.gl": ">=4.2.0-alpha.12",
     "extrude-polyline": "^1.0.6",
-    "luma.gl": ">=4.1.0-alpha.4",
+    "luma.gl": ">=4.1.0-alpha.5",
     "react": "^15.4.1",
     "react-autobind": "^1.0.6",
     "react-dom": "^15.4.1",
diff --git a/examples/layer-browser/src/data-samples.js b/examples/layer-browser/src/data-samples.js
@@ -14,7 +14,7 @@ export {default as s2cells} from '../data/sf.s2cells.json';
 export {choropleths};
 
 export const points = allPoints;
-export const positionOrigin = [-122.45, 37.75, 0];
+export const positionOrigin = [-122.42694203247012, 37.751537058389985];
 
 export const worldGrid = pointsToWorldGrid(points, 500);
 
@@ -24,6 +24,21 @@ export const zigzag = [
       positionOrigin[0] + i * i * 0.001,
       positionOrigin[1] + Math.cos(i * Math.PI) * 0.2 / (i + 4)
     ])
+  },
+  {
+    path: new Array(6).fill(0).map((d, i) => [
+      positionOrigin[0] + Math.cos(i * Math.PI) * 0.05 / (i + 4),
+      positionOrigin[1] - i * i * 0.0003
+    ])
+  },
+  {
+    path: [[
+      positionOrigin[0] - 0.005,
+      positionOrigin[1] + 0.005
+    ], [
+      positionOrigin[0] - 0.005,
+      positionOrigin[1] - 0.005
+    ]]
   }
 ];
 
diff --git a/examples/layer-browser/src/examples/core-layers.js b/examples/layer-browser/src/examples/core-layers.js
@@ -21,7 +21,6 @@ import {
 // Demonstrate immutable support
 import {experimental} from 'deck.gl';
 const {get} = experimental;
-
 import dataSamples from '../immutable-data-samples';
 import {parseColor, setOpacity} from '../utils/color';
 
diff --git a/package.json b/package.json
@@ -46,8 +46,8 @@
     "earcut": "^2.0.6",
     "mjolnir.js": ">=0.1.0",
     "lodash.flattendeep": "^4.4.0",
-    "luma.gl": ">=4.1.0-alpha.4",
-    "math.gl": ">= 1.0.0-alpha.7",
+    "luma.gl": ">=4.1.0-alpha.5",
+    "math.gl": ">= 1.0.0-alpha.8",
     "prop-types": "^15.5.8",
     "seer": "^0.2.3",
     "viewport-mercator-project": ">= 4.2.0-alpha.2"
diff --git a/src/core/lib/draw-layers.js b/src/core/lib/draw-layers.js
@@ -186,8 +186,13 @@ function drawLayersInViewport(gl, {
         {layerIndex}
       );
 
+      // All parameter resolving is done here instead of the layer
       // Blend parameters must not be overriden
-      const layerParameters = Object.assign({viewport: glViewport}, layer.props.parameters || {});
+      const layerParameters = Object.assign({}, layer.props.parameters || {}, parameters);
+
+      Object.assign(layerParameters, {
+        viewport: glViewport
+      });
 
       if (drawPickingColors) {
         // TODO - Disable during picking
@@ -198,7 +203,7 @@ function drawLayersInViewport(gl, {
         });
       }
 
-      withParameters(gl, parameters, () => {
+      withParameters(gl, layerParameters, () => {
         layer.drawLayer({
           moduleParameters,
           uniforms,
@@ -215,7 +220,7 @@ function drawLayersInViewport(gl, {
   const message = `\
 #${renderCount++}: Rendering ${pass} : ${visibleCount} of ${totalCount} layers \
 (${hiddenCount} hidden, ${compositeCount} composite ${pickableCount} unpickable) \
-DPR={pixelRatio} pick={$drawPickingColors}`;
+DPR={pixelRatio} pick=${drawPickingColors}`;
 
   log.log(2, message);
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2890,9 +2890,9 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-luma.gl@>=4.1.0-alpha.4:
-  version "4.1.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/luma.gl/-/luma.gl-4.1.0-alpha.4.tgz#67d23ad2d1e15444fb6d8b09bed5494ba829443f"
+luma.gl@>=4.1.0-alpha.5:
+  version "4.1.0-alpha.5"
+  resolved "https://registry.yarnpkg.com/luma.gl/-/luma.gl-4.1.0-alpha.5.tgz#15a71db0fa28bb56b0820c72d5bef96197154d54"
   dependencies:
     gl-mat4 "^1.1.4"
     gl-quat "^1.0.0"
@@ -2918,7 +2918,17 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-"math.gl@>= 1.0.0-alpha.7", math.gl@^1.0.0-alpha.7:
+"math.gl@>= 1.0.0-alpha.8":
+  version "1.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-1.0.0-alpha.8.tgz#51dd8d03e5c50096851e8a268d888c1eda766cd1"
+  dependencies:
+    gl-mat4 "^1.1.4"
+    gl-quat "^1.0.0"
+    gl-vec2 "^1.0.0"
+    gl-vec3 "^1.0.3"
+    gl-vec4 "^1.0.1"
+
+math.gl@^1.0.0-alpha.7:
   version "1.0.0-alpha.7"
   resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-1.0.0-alpha.7.tgz#c8b2ed001f0f9f805f499e23f99fd69f576bdebc"
   dependencies:
