Skip to content

Commit

Permalink
Bump loaders.gl to 2.0.0-beta (#4009)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pessimistress
Pessimistress committed Dec 13, 2019
1 parent 742cff9 commit fa886a5
Show file tree
Hide file tree
Showing 18 changed files with 158 additions and 205 deletions.
6 changes: 3 additions & 3 deletions examples/layer-browser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"start-local-production": "webpack-dev-server --env.local --env.production --progress --hot --open"
},
"dependencies": {
"@loaders.gl/ply": "^1.3.3",
"@loaders.gl/gltf": "^1.3.3",
"@luma.gl/experimental": "^8.0.0-beta.2",
"@loaders.gl/ply": "^2.0.0-beta.3",
"@loaders.gl/gltf": "^2.0.0-beta.3",
"@luma.gl/experimental": "^8.0.0-beta.3",
"@luma.gl/debug": "^8.0.0-beta.2",
"colorbrewer": "^1.0.0",
"d3-request": "^1.0.6",
Expand Down
8 changes: 4 additions & 4 deletions examples/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
},
"dependencies": {
"deck.gl": "^7.3.6",
"@loaders.gl/csv": "^1.3.4",
"@loaders.gl/core": "^1.3.4",
"@loaders.gl/draco": "^1.3.4",
"@luma.gl/constants": "^8.0.0-beta.2",
"@loaders.gl/csv": "^2.0.0-beta.3",
"@loaders.gl/core": "^2.0.0-beta.3",
"@loaders.gl/draco": "^2.0.0-beta.3",
"@luma.gl/constants": "^8.0.0-beta.3",
"brace": "^0.11.1",
"react": "~16.9.0",
"react-ace": "^6.1.4",
Expand Down
3 changes: 2 additions & 1 deletion examples/webpack.config.local.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR, linkToLuma) {
'@luma.gl/experimental': `${ROOT_DIR}/node_modules/@luma.gl/experimental`,
// @luma.gl/experimental is not available in the root node_modules, must be imported
// where required.
'@loaders.gl/core': `${ROOT_DIR}/node_modules/@loaders.gl/core`
'@loaders.gl/core': `${ROOT_DIR}/node_modules/@loaders.gl/core`,
'@loaders.gl/images': `${ROOT_DIR}/node_modules/@loaders.gl/images`
};

const LUMA_ALIASES = linkToLuma ? LUMA_LINK_ALIASES : LUMA_LOCAL_ALIASES;
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"dependencies": {
"deck.gl": "^7.3.0-beta",
"@loaders.gl/draco": "^1.3.1",
"@loaders.gl/draco": "^2.0.0-beta.3",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mesh/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/obj": "^1.3.3",
"@loaders.gl/obj": "^2.0.0-beta.3",
"deck.gl": "^7.3.0-beta",
"react": "^16.3.0",
"react-dom": "^16.3.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/website/point-cloud/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/las": "^1.3.3",
"@loaders.gl/ply": "^1.3.3",
"@loaders.gl/las": "^2.0.0-beta.3",
"@loaders.gl/ply": "^2.0.0-beta.3",
"deck.gl": "^7.3.0-beta",
"react": "^16.3.0",
"react-dom": "^16.3.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/website/scenegraph-layer/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {StaticMap} from 'react-map-gl';
import DeckGL from '@deck.gl/react';
import {ScenegraphLayer} from '@deck.gl/mesh-layers';

import {GLTFScenegraphLoader} from '@luma.gl/experimental';
import {GLTFLoader} from '@loaders.gl/gltf';
import {registerLoaders} from '@loaders.gl/core';

registerLoaders([GLTFScenegraphLoader]);
registerLoaders([GLTFLoader]);

// Set your mapbox token here
const MAPBOX_TOKEN = process.env.MapboxAccessToken; // eslint-disable-line
Expand Down
2 changes: 1 addition & 1 deletion examples/website/scenegraph-layer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@deck.gl/mesh-layers": "^7.3.0-beta",
"@deck.gl/react": "^7.3.0-beta",
"@luma.gl/experimental": "^8.0.0-beta.2",
"@loaders.gl/gltf": "^2.0.0-beta.3",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/aggregation-layers/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/shadertools": "^8.0.0-beta.2",
"@luma.gl/shadertools": "^8.0.0-beta.3",
"@math.gl/web-mercator": "^3.1.0-alpha",
"d3-hexbin": "^0.2.1"
},
Expand Down
6 changes: 3 additions & 3 deletions modules/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"prepublishOnly": "npm run build-debugger && npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/core": "^1.3.4",
"@loaders.gl/images": "^1.3.4",
"@luma.gl/core": "^8.0.0-beta.2",
"@loaders.gl/core": "^2.0.0-beta.3",
"@loaders.gl/images": "^2.0.0-beta.3",
"@luma.gl/core": "^8.0.0-beta.3",
"@math.gl/web-mercator": "^3.1.0-alpha",
"gl-matrix": "^3.0.0",
"math.gl": "^3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions modules/geo-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^1.3.4",
"@loaders.gl/core": "^1.3.4",
"@loaders.gl/gltf": "^1.3.4",
"@loaders.gl/3d-tiles": "^2.0.0-beta.3",
"@loaders.gl/core": "^2.0.0-beta.3",
"@loaders.gl/gltf": "^2.0.0-beta.3",
"@math.gl/culling": "^3.0.0",
"@math.gl/geospatial": "^3.0.0",
"@math.gl/web-mercator": "^3.1.0-alpha",
Expand Down
4 changes: 2 additions & 2 deletions modules/geo-layers/src/tile-3d-layer/tile-3d-layer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ export default class Tile3DLayer extends CompositeLayer {
return await this._loadTileset(url, {headers}, ionMetadata);
}

_updateTileset(tileset3d) {
async _updateTileset(tileset3d) {
const {timeline, viewport} = this.context;
if (!timeline || !viewport || !tileset3d) {
return;
}

// use Date.now() as frame identifier for now and later used to filter layers for rendering
const frameState = getFrameState(viewport, Date.now());
tileset3d.update(frameState);
await tileset3d.update(frameState);
this._updateLayerMap(frameState.frameNumber);
}

Expand Down
10 changes: 5 additions & 5 deletions modules/jupyter-widget/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@deck.gl/layers": "8.0.0-alpha.2",
"@deck.gl/mesh-layers": "8.0.0-alpha.2",
"@jupyter-widgets/base": "^2",
"@loaders.gl/3d-tiles": "^1.3.4",
"@loaders.gl/core": "^1.3.4",
"@loaders.gl/csv": "^1.3.4",
"@loaders.gl/las": "^1.3.4",
"@luma.gl/constants": "^8.0.0-beta.2",
"@loaders.gl/3d-tiles": "^2.0.0-beta.3",
"@loaders.gl/core": "^2.0.0-beta.3",
"@loaders.gl/csv": "^2.0.0-beta.3",
"@loaders.gl/las": "^2.0.0-beta.3",
"@luma.gl/constants": "^8.0.0-beta.3",
"mapbox-gl": "^1.2.1"
},
"jupyterlab": {
Expand Down
2 changes: 1 addition & 1 deletion modules/layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/images": "^1.3.4",
"@loaders.gl/images": "^2.0.0-beta.3",
"@mapbox/tiny-sdf": "^1.1.0",
"earcut": "^2.0.6"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/mesh-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"@deck.gl/core": "^7.3.0-beta"
},
"dependencies": {
"@luma.gl/experimental": "^8.0.0-beta.2"
"@luma.gl/experimental": "^8.0.0-beta.3"
}
}
4 changes: 2 additions & 2 deletions modules/test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
],
"peerDependencies": {
"@deck.gl/core": "^7.3.0-beta",
"@luma.gl/test-utils": "^8.0.0-beta.2",
"@luma.gl/webgl": "^8.0.0-beta.2",
"@luma.gl/test-utils": "^8.0.0-beta.3",
"@luma.gl/webgl": "^8.0.0-beta.3",
"@probe.gl/test-utils": "^3.1.0"
},
"scripts": {}
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"jsdom": false
},
"devDependencies": {
"@luma.gl/engine": "^8.0.0-beta.2",
"@luma.gl/test-utils": "^8.0.0-beta.2",
"@luma.gl/engine": "^8.0.0-beta.3",
"@luma.gl/test-utils": "^8.0.0-beta.3",
"@probe.gl/bench": "^3.2.0-beta.3",
"@probe.gl/test-utils": "^3.2.0-beta.3",
"@loaders.gl/csv": "^1.3.4",
"@loaders.gl/polyfills": "^1.3.4",
"@loaders.gl/csv": "^2.0.0-beta.3",
"@loaders.gl/polyfills": "^2.0.0-beta.3",
"babel-loader": "^8.0.0",
"babel-plugin-inline-webgl-constants": "^1.0.1",
"babel-plugin-remove-glsl-comments": "^0.1.0",
Expand All @@ -60,7 +60,7 @@
"gl": "^4.3.3",
"glsl-transpiler": "^1.8.3",
"jsdom": "^15.0.0",
"ocular-dev-tools": "0.0.29",
"ocular-dev-tools": "0.0.33",
"png.js": "^0.1.1",
"pre-commit": "^1.2.2",
"pre-push": "^0.1.1",
Expand Down

0 comments on commit fa886a5

Please sign in to comment.