Skip to content

Commit

Permalink
Fix stale layer bug when using matrix attributes (#2901)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tsherif
tsherif committed Apr 5, 2019
1 parent 20df8c6 commit 03af631
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 135 deletions.
2 changes: 1 addition & 1 deletion modules/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-beta.3",
"@luma.gl/core": "^7.0.0-beta.4",
"gl-matrix": "^3.0.0",
"math.gl": "^2.3.0",
"mjolnir.js": "^2.0.2",
Expand Down
4 changes: 2 additions & 2 deletions modules/mesh-layers/src/scenegraph-layer/scenegraph-layer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {Layer} from '@deck.gl/core';
import {fp64, ScenegraphNode, log} from '@luma.gl/core';
import {loadFile} from '@loaders.gl/core';

import {getMatrixAttributes} from '../utils/matrix';
import {MATRIX_ATTRIBUTES} from '../utils/matrix';

import vs from './scenegraph-layer-vertex.glsl';
import fs from './scenegraph-layer-fragment.glsl';
Expand Down Expand Up @@ -76,7 +76,7 @@ export default class ScenegraphLayer extends Layer {
accessor: 'getColor',
defaultValue: DEFAULT_COLOR
},
instanceModelMatrix: getMatrixAttributes(this)
instanceModelMatrix: MATRIX_ATTRIBUTES
});
}

Expand Down
4 changes: 2 additions & 2 deletions modules/mesh-layers/src/simple-mesh-layer/simple-mesh-layer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {loadImage} from '@loaders.gl/core';
import {Matrix4} from 'math.gl';
const {fp64LowPart} = fp64;

import {getMatrixAttributes} from '../utils/matrix';
import {MATRIX_ATTRIBUTES} from '../utils/matrix';

import vs from './simple-mesh-layer-vertex.glsl';
import fs from './simple-mesh-layer-fragment.glsl';
Expand Down Expand Up @@ -150,7 +150,7 @@ export default class SimpleMeshLayer extends Layer {
accessor: 'getColor',
defaultValue: [0, 0, 0, 255]
},
instanceModelMatrix: getMatrixAttributes(this)
instanceModelMatrix: MATRIX_ATTRIBUTES
});

this.setState({
Expand Down
189 changes: 93 additions & 96 deletions modules/mesh-layers/src/utils/matrix.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,123 +48,120 @@ function getMat3FromMat4(mat4) {
return mat4.subarray(0, 9);
}

function calculateModelMatrices(layer, attribute) {
const {data, getOrientation, getScale, getTranslation, getTransformMatrix} = layer.props;

const constantMatrix = Array.isArray(getTransformMatrix);
const constantScale = Array.isArray(getScale);
const constantOrientation = Array.isArray(getOrientation);
const constantTranslation = Array.isArray(getTranslation);

const hasMatrix = getTransformMatrix && (constantMatrix || Boolean(getTransformMatrix(data[0])));
export const MATRIX_ATTRIBUTES = {
size: 12,
accessor: ['getOrientation', 'getScale', 'getTranslation', 'getTransformMatrix'],
shaderAttributes: {
instanceModelMatrix__LOCATION_0: {
size: 3,
stride: 48,
offset: 0
},
instanceModelMatrix__LOCATION_1: {
size: 3,
stride: 48,
offset: 12
},
instanceModelMatrix__LOCATION_2: {
size: 3,
stride: 48,
offset: 24
},
instanceTranslation: {
size: 3,
stride: 48,
offset: 36
}
},

if (hasMatrix) {
attribute.constant = constantMatrix;
} else {
attribute.constant = constantOrientation && constantScale && constantTranslation;
}
update(attribute) {
// NOTE(Tarek): "this" will be bound to a layer!
const {data, getOrientation, getScale, getTranslation, getTransformMatrix} = this.props;

const instanceModelMatrixData = attribute.value;
const constantMatrix = Array.isArray(getTransformMatrix);
const constantScale = Array.isArray(getScale);
const constantOrientation = Array.isArray(getOrientation);
const constantTranslation = Array.isArray(getTranslation);

if (attribute.constant) {
let matrix;
const hasMatrix =
getTransformMatrix && (constantMatrix || Boolean(getTransformMatrix(data[0])));

if (hasMatrix) {
modelMatrix.set(getTransformMatrix);
modelTranslation[0] = modelMatrix[12];
modelTranslation[1] = modelMatrix[13];
modelTranslation[2] = modelMatrix[14];
matrix = getMat3FromMat4(modelMatrix);
attribute.constant = constantMatrix;
} else {
matrix = linearTransform;

const orientation = getOrientation;
const scale = getScale;

calculateTransformMatrix(matrix, orientation, scale);
modelTranslation.set(getTranslation);
attribute.constant = constantOrientation && constantScale && constantTranslation;
}

const valueMatrix = new Float32Array(matrix);
const valueTranslation = new Float32Array(modelTranslation);
const shaderAttributes = attribute.userData.shaderAttributes;
shaderAttributes.instanceModelMatrix__LOCATION_0.value = valueMatrix.subarray(0, 3);
shaderAttributes.instanceModelMatrix__LOCATION_1.value = valueMatrix.subarray(3, 6);
shaderAttributes.instanceModelMatrix__LOCATION_2.value = valueMatrix.subarray(6, 9);
shaderAttributes.instanceTranslation.value = valueTranslation;
} else {
let i = 0;
const {iterable, objectInfo} = createIterable(data);
for (const object of iterable) {
objectInfo.index++;
const instanceModelMatrixData = attribute.value;

if (attribute.constant) {
let matrix;

if (hasMatrix) {
modelMatrix.set(
constantMatrix ? getTransformMatrix : getTransformMatrix(object, objectInfo)
);
modelMatrix.set(getTransformMatrix);
modelTranslation[0] = modelMatrix[12];
modelTranslation[1] = modelMatrix[13];
modelTranslation[2] = modelMatrix[14];
matrix = getMat3FromMat4(modelMatrix);
} else {
matrix = linearTransform;

const orientation = constantOrientation
? getOrientation
: getOrientation(object, objectInfo);
const scale = constantScale ? getScale : getScale(object, objectInfo);
const orientation = getOrientation;
const scale = getScale;

calculateTransformMatrix(matrix, orientation, scale);
modelTranslation.set(
constantTranslation ? getTranslation : getTranslation(object, objectInfo)
);
modelTranslation.set(getTranslation);
}

instanceModelMatrixData[i++] = matrix[0];
instanceModelMatrixData[i++] = matrix[1];
instanceModelMatrixData[i++] = matrix[2];
instanceModelMatrixData[i++] = matrix[3];
instanceModelMatrixData[i++] = matrix[4];
instanceModelMatrixData[i++] = matrix[5];
instanceModelMatrixData[i++] = matrix[6];
instanceModelMatrixData[i++] = matrix[7];
instanceModelMatrixData[i++] = matrix[8];
instanceModelMatrixData[i++] = modelTranslation[0];
instanceModelMatrixData[i++] = modelTranslation[1];
instanceModelMatrixData[i++] = modelTranslation[2];
}
}
}

export function getMatrixAttributes(layer) {
return {
size: 12,
accessor: ['getOrientation', 'getScale', 'getTranslation', 'getTransformMatrix'],
shaderAttributes: {
instanceModelMatrix__LOCATION_0: {
size: 3,
stride: 48,
offset: 0
},
instanceModelMatrix__LOCATION_1: {
size: 3,
stride: 48,
offset: 12
},
instanceModelMatrix__LOCATION_2: {
size: 3,
stride: 48,
offset: 24
},
instanceTranslation: {
size: 3,
stride: 48,
offset: 36
const valueMatrix = new Float32Array(matrix);
const valueTranslation = new Float32Array(modelTranslation);
const shaderAttributes = attribute.userData.shaderAttributes;
shaderAttributes.instanceModelMatrix__LOCATION_0.value = valueMatrix.subarray(0, 3);
shaderAttributes.instanceModelMatrix__LOCATION_1.value = valueMatrix.subarray(3, 6);
shaderAttributes.instanceModelMatrix__LOCATION_2.value = valueMatrix.subarray(6, 9);
shaderAttributes.instanceTranslation.value = valueTranslation;
} else {
let i = 0;
const {iterable, objectInfo} = createIterable(data);
for (const object of iterable) {
objectInfo.index++;
let matrix;

if (hasMatrix) {
modelMatrix.set(
constantMatrix ? getTransformMatrix : getTransformMatrix(object, objectInfo)
);
modelTranslation[0] = modelMatrix[12];
modelTranslation[1] = modelMatrix[13];
modelTranslation[2] = modelMatrix[14];
matrix = getMat3FromMat4(modelMatrix);
} else {
matrix = linearTransform;

const orientation = constantOrientation
? getOrientation
: getOrientation(object, objectInfo);
const scale = constantScale ? getScale : getScale(object, objectInfo);

calculateTransformMatrix(matrix, orientation, scale);
modelTranslation.set(
constantTranslation ? getTranslation : getTranslation(object, objectInfo)
);
}

instanceModelMatrixData[i++] = matrix[0];
instanceModelMatrixData[i++] = matrix[1];
instanceModelMatrixData[i++] = matrix[2];
instanceModelMatrixData[i++] = matrix[3];
instanceModelMatrixData[i++] = matrix[4];
instanceModelMatrixData[i++] = matrix[5];
instanceModelMatrixData[i++] = matrix[6];
instanceModelMatrixData[i++] = matrix[7];
instanceModelMatrixData[i++] = matrix[8];
instanceModelMatrixData[i++] = modelTranslation[0];
instanceModelMatrixData[i++] = modelTranslation[1];
instanceModelMatrixData[i++] = modelTranslation[2];
}
},
update: function updater(attribute) {
calculateModelMatrices(layer, attribute);
}
};
}
}
};
68 changes: 34 additions & 34 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,64 +705,64 @@
dependencies:
text-encoding "^0.6.4"

"@luma.gl/constants@7.0.0-beta.3":
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.0.0-beta.3.tgz#92e3a0b7d9124c0cf3cbcf1fa199c77516826e3b"
integrity sha512-kFp72OwJrrDBOQcR57D6hZZ25mNpkyz12NHKJvTK61QmzJwzHdNepDwB9IQebU5X2DxFsiYICl1ProwtnN906Q==
"@luma.gl/constants@7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.0.0-beta.4.tgz#6873704fcf2141b0a1392a8eb3c313770284257b"
integrity sha512-HRpGGxUh8SOwDtUmKfpfmny74lo/4mXX8s7OsFxGBhpGeOQ1TWGaXer7L4BzNbw8zm5GyypPS3yw1y8RcQKx8w==

"@luma.gl/constants@^7.0.0-alpha.6":
version "7.0.0-alpha.19"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.0.0-alpha.19.tgz#f9dcb21ebb53d1736be27aad68073c1562bc3d81"
integrity sha512-7vxAjPSX80eRkDiAp5ro8NWZS5syIgHiaNfG6yhvHDXFfR8nghks1EHA3CqToUy8RDZn7p08pv4P2V8dFhs64Q==

"@luma.gl/core@^7.0.0-beta.3":
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-7.0.0-beta.3.tgz#d7b7fbd89568d870a50670e524b9c4ad77e8e4a9"
integrity sha512-ba8dKuQ7qhr1CNmVJFvxW3U5F7xDSMIPo1xkFhr5aYIxewfe33Y+/UJpYyVuJAM9JRYelGfAsiWa7dwCQBR2cw==
"@luma.gl/core@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-7.0.0-beta.4.tgz#b15990a30ca5cf9feab6c8412fde5f696afb86e4"
integrity sha512-5cJBvufnP37mqzn8s6/SsF6ew8EUj7CZAdYVaRsu/DfCFLndypL4VN/af9MdgSltIQW3R36pXCuZh7QXCm7o7g==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.0.0-beta.3"
"@luma.gl/shadertools" "7.0.0-beta.3"
"@luma.gl/webgl" "7.0.0-beta.3"
"@luma.gl/webgl-state-tracker" "7.0.0-beta.3"
"@luma.gl/webgl2-polyfill" "7.0.0-beta.3"
"@luma.gl/constants" "7.0.0-beta.4"
"@luma.gl/shadertools" "7.0.0-beta.4"
"@luma.gl/webgl" "7.0.0-beta.4"
"@luma.gl/webgl-state-tracker" "7.0.0-beta.4"
"@luma.gl/webgl2-polyfill" "7.0.0-beta.4"
math.gl "^2.3.0"
probe.gl "^3.0.1"
seer "^0.2.4"

"@luma.gl/shadertools@7.0.0-beta.3":
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-7.0.0-beta.3.tgz#33a844bf8cf627992f6df88925ea96057facaf93"
integrity sha512-ST1mFQBMzbi9CGa7kmyCn0KPSJ0TwjgZ7wu7/TVhmC9n4hlkkxkqwneE2n+eeUekjbAAQQZvQrZqGLmQPel3+A==
"@luma.gl/shadertools@7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-7.0.0-beta.4.tgz#7e71aced2d48954d5a9aae5660068093a38f82e9"
integrity sha512-F2F1446zR+ww4gw+wQ800rT7v4KxIsU+ZwuHQhpmtcj0yBCiVAKGdPT27isuO/zL1LjKgnN4xtCggdAsMR82bw==
dependencies:
"@babel/runtime" "^7.0.0"
math.gl "^2.3.0"

"@luma.gl/webgl-state-tracker@7.0.0-beta.3":
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.0.0-beta.3.tgz#0a4b3d8d50d9f9651ec8fd9020f7f4ab187e5c48"
integrity sha512-hlvK21TkzkShmwsJnRT48f1tBmksYydfQeS7ciTWH5EGF1HNI1PU00ioBLqBo2KhDsimn9HzWAyu4Qin5JjD3Q==
"@luma.gl/webgl-state-tracker@7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.0.0-beta.4.tgz#0082888d65916ce08d1e87330a32c43128d2c4de"
integrity sha512-z1ObXsUxQoWlG1yQtENq8sVXQJ5ZWD9K2s154Eq56TSvuw713eBth37bQdOld3UpV3YReZsNj+46ZPOHGttpAQ==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.0.0-beta.3"
"@luma.gl/constants" "7.0.0-beta.4"

"@luma.gl/webgl2-polyfill@7.0.0-beta.3":
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.0.0-beta.3.tgz#ef2a32efca07dba12cbd13fb7fb5f80445f17a06"
integrity sha512-HorcUH13DQePEMANmSJG4374lf5kXTzfj5zCytXZgSLhlmxWL98VO2JcKHqRGTxz7naKBbaAdhItm1IL28AkVA==
"@luma.gl/webgl2-polyfill@7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.0.0-beta.4.tgz#fd90eb5fa6fe4dfbf7c2e2aa8b2e414984511b39"
integrity sha512-FlAidAfuYTzuhTxOMOuhjYtTFljAUYDcEWCS3MPtgEzKZuyDJJ+dplP9/66fWHEFkLLWeDGUjiKggYMejXQYQw==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.0.0-beta.3"
"@luma.gl/constants" "7.0.0-beta.4"

"@luma.gl/webgl@7.0.0-beta.3":
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-7.0.0-beta.3.tgz#c91e3dbdd89744bea29d219436d04c4c97bcb6e6"
integrity sha512-tgccePZ1M83rBH+mMhMfPvIzv7MMFlXigVgMnHJduwl65cRrxzl+DxULDFVZWe2Ey3fjHuXtpx9wwSIeqThvcw==
"@luma.gl/webgl@7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-7.0.0-beta.4.tgz#46c82f2c8f3958dd27df36cac1b21738ffc081ac"
integrity sha512-F+7y8mqxloNhUPmx1rjGJ7+Imgo4cx+MAyvFvCUVf77c+Nh3JpiH+S3xfFf91TRkD1R7OwiO7CEJTAIDBRmGkw==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.0.0-beta.3"
"@luma.gl/webgl-state-tracker" "7.0.0-beta.3"
"@luma.gl/webgl2-polyfill" "7.0.0-beta.3"
"@luma.gl/constants" "7.0.0-beta.4"
"@luma.gl/webgl-state-tracker" "7.0.0-beta.4"
"@luma.gl/webgl2-polyfill" "7.0.0-beta.4"
probe.gl "^3.0.1"

"@mapbox/geojson-area@0.2.2":
Expand Down

0 comments on commit 03af631

Please sign in to comment.