Merge 91d0acc into fc89412

visgl · Sep 10, 2019 · 48d9d42 · 48d9d42
2 parents fc89412 + 91d0acc
commit 48d9d42
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -35,7 +35,7 @@
     "@luma.gl/addons": "^7.3.0-alpha.7",
     "@luma.gl/core": "^7.3.0-alpha.7",
     "gl-matrix": "^3.0.0",
-    "math.gl": "^2.3.0",
+    "math.gl": "^3.0.0-beta.3",
     "mjolnir.js": "^2.1.2",
     "probe.gl": "^3.1.0-beta.3",
     "seer": "^0.2.4",

diff --git a/modules/core/src/shaderlib/shadow/shadow.js b/modules/core/src/shaderlib/shadow/shadow.js
@@ -128,7 +128,7 @@ function screenToCommonSpace(xyz, pixelUnprojectionMatrix) {
 }
 
 function getViewportCenterPosition({viewport, center}) {
-  return new Matrix4(viewport.viewProjectionMatrix).invert().transformVector4(center);
+  return new Matrix4(viewport.viewProjectionMatrix).invert().transform(center);
 }
 
 function getViewProjectionMatrices({viewport, shadowMatrices}) {
@@ -148,7 +148,7 @@ function getViewProjectionMatrices({viewport, shadowMatrices}) {
 
   for (const shadowMatrix of shadowMatrices) {
     const viewMatrix = shadowMatrix.clone().translate(new Vector3(viewport.center).negate());
-    const positions = corners.map(corner => viewMatrix.transformVector3(corner));
+    const positions = corners.map(corner => viewMatrix.transform(corner));
     const projectionMatrix = new Matrix4().ortho({
       left: Math.min(...positions.map(position => position[0])),
       right: Math.max(...positions.map(position => position[0])),
@@ -195,7 +195,7 @@ function createShadowUniforms(opts = {}, context = {}) {
       viewProjectionMatrices[i] = viewProjectionMatrix
         .clone()
         .multiplyRight(VECTOR_TO_POINT_MATRIX);
-      projectCenters[i] = viewProjectionMatrixCentered.transformVector4(center);
+      projectCenters[i] = viewProjectionMatrixCentered.transform(center);
     }
   }
 

diff --git a/modules/core/src/transitions/transition-interpolator.js b/modules/core/src/transitions/transition-interpolator.js
@@ -32,7 +32,11 @@ export default class TransitionInterpolator {
    */
   arePropsEqual(currentProps, nextProps) {
     for (const key of this._propsToCompare || Object.keys(nextProps)) {
-      if (!equals(currentProps[key], nextProps[key])) {
+      if (
+        !(key in currentProps) ||
+        !(key in nextProps) ||
+        !equals(currentProps[key], nextProps[key])
+      ) {
         return false;
       }
     }

diff --git a/test/apps/multi-viewport/package.json b/test/apps/multi-viewport/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "deck.gl": "^7.0.0",
-    "math.gl": "^2.1.0",
+    "math.gl": "^3.0.0-beta.3",
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
     "react-map-gl": "^4.1.2"

diff --git a/test/modules/core/shaderlib/shadow/shadow.spec.js b/test/modules/core/shaderlib/shadow/shadow.spec.js
@@ -149,7 +149,7 @@ test('shadow#getUniforms', t => {
   );
 
   for (const value of TEST_CASE1) {
-    const result = uniforms[`shadow_uViewProjectionMatrices[0]`].transformVector3(value.xyz);
+    const result = uniforms[`shadow_uViewProjectionMatrices[0]`].transform(value.xyz);
     t.equal(
       insideClipSpace(result),
       value.result,
@@ -178,7 +178,7 @@ test('shadow#getUniforms', t => {
   );
 
   for (const value of TEST_CASE2) {
-    const result = uniforms[`shadow_uViewProjectionMatrices[0]`].transformVector3(value.xyz);
+    const result = uniforms[`shadow_uViewProjectionMatrices[0]`].transform(value.xyz);
     const center = uniforms[`shadow_uProjectCenters[0]`];
     t.equal(
       insideClipSpace([
@@ -208,7 +208,7 @@ test('shadow#getUniforms', t => {
   );
 
   for (const value of TEST_CASE3) {
-    const result = uniforms[`shadow_uViewProjectionMatrices[0]`].transformVector3(value.xyz);
+    const result = uniforms[`shadow_uViewProjectionMatrices[0]`].transform(value.xyz);
     t.equal(
       insideClipSpace(result),
       value.result,